diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-06 00:22:20 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-06 00:22:20 +0000 |
commit | 75d8cbb5511c40341ac442a3a8e57f6d811c7ab8 (patch) | |
tree | 2bc9241e535f22e7c7ae3deb2fddd2f0b1c30d83 /channels/chan_oss.c | |
parent | 302e0dc67407eb3e2dc0c8e4f95544a4dba32137 (diff) |
Merged revisions 106239 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r106239 | file | 2008-03-05 16:43:22 -0600 (Wed, 05 Mar 2008) | 12 lines
Merged revisions 106235 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r106235 | file | 2008-03-05 18:32:10 -0400 (Wed, 05 Mar 2008) | 4 lines
Add a control frame to indicate the source of media has changed. Depending on the underlying technology it may need to change some things.
(closes issue #12148)
Reported by: jcomellas
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@106318 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_oss.c')
-rw-r--r-- | channels/chan_oss.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/channels/chan_oss.c b/channels/chan_oss.c index 4f40085fa..626951208 100644 --- a/channels/chan_oss.c +++ b/channels/chan_oss.c @@ -764,6 +764,7 @@ static int oss_indicate(struct ast_channel *c, int cond, const void *data, size_ case AST_CONTROL_PROGRESS: case AST_CONTROL_PROCEEDING: case AST_CONTROL_VIDUPDATE: + case AST_CONTROL_SRCUPDATE: break; case AST_CONTROL_HOLD: ast_verbose(" << Console Has Been Placed on Hold >> \n"); |