diff options
author | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-25 16:19:13 +0000 |
---|---|---|
committer | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-25 16:19:13 +0000 |
commit | 1f6392d3643ebee2041b919b592c90940b195b32 (patch) | |
tree | 6abef4503ea64977110e48bdd1d231bb0c338fe8 | |
parent | 533adda61aec243b6547dbde3cbcee4df17c6604 (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.0@254466 f38db490-d61c-443f-a65b-d21fe96a405b
-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 6dcc3b452..0cfc78fff 100644 --- a/main/file.c +++ b/main/file.c @@ -1260,6 +1260,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: |