]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 254453 via svnmerge from
authorTerry Wilson <twilson@digium.com>
Thu, 25 Mar 2010 16:23:32 +0000 (16:23 +0000)
committerTerry Wilson <twilson@digium.com>
Thu, 25 Mar 2010 16:23:32 +0000 (16:23 +0000)
https://origsvn.digium.com/svn/asterisk/trunk

................
  r254453 | twilson | 2010-03-25 11:03:51 -0500 (Thu, 25 Mar 2010) | 9 lines

  Merged revisions 254451 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r254451 | twilson | 2010-03-25 10:57:29 -0500 (Thu, 25 Mar 2010) | 2 lines

    Handle new SRCCHANGE control message here too
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@254486 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/file.c

index cd7063ab47dfd9bdec9839cbef0d15bbd377a6bc..5595d229272d1419834d52781e065f61b1a7f7ae 100644 (file)
@@ -1276,6 +1276,7 @@ static int waitstream_core(struct ast_channel *c, const char *breakon,
                                case AST_CONTROL_ANSWER:
                                case AST_CONTROL_VIDUPDATE:
                                case AST_CONTROL_SRCUPDATE:
+                               case AST_CONTROL_SRCCHANGE:
                                case AST_CONTROL_HOLD:
                                case AST_CONTROL_UNHOLD:
                                case -1: