diff options
author | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-25 16:23:32 +0000 |
---|---|---|
committer | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-25 16:23:32 +0000 |
commit | 24d78534f143888f4c9cdc1b0aca9cc419b1bbee (patch) | |
tree | 1e55c51074ec6e36a20e048d154943005f779108 /main | |
parent | 82c965f3ec29fb38efd5c339272bc883b0e2fe1d (diff) |
Merged revisions 254453 via svnmerge from
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@254486 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/file.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/main/file.c b/main/file.c index cd7063ab4..5595d2292 100644 --- a/main/file.c +++ b/main/file.c @@ -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: |