aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortwilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-25 16:26:13 +0000
committertwilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-25 16:26:13 +0000
commit6cd304fbb89b6c12210309e44b2b7c871b16c431 (patch)
treeca03290853d882dc548836787c1ecfc9cc73a8eb
parent1fe83841d385c91266e7730fb08fd68742f1b3d1 (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.2@254499 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/file.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/main/file.c b/main/file.c
index e326ab8f8..98c0f208c 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: