kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-17 07:18:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 51211 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r51211 | file | 2007-01-17 19:18:44 -0500 (Wed, 17 Jan 2007) | 2 lines

Pass data as well for hold/unhold/vidupdate frames. (issue #8840 reported by mdu113)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51212 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-01-18 00:20:50 +00:00
parent 445269f001
commit 461d49d2bd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/rtp.c
View File

@@ -2931,7 +2931,7 @@ static enum ast_bridge_result bridge_native_loop(struct ast_channel *c0, struct
if ((fr->subclass == AST_CONTROL_HOLD) || if ((fr->subclass == AST_CONTROL_HOLD) ||
(fr->subclass == AST_CONTROL_UNHOLD) || (fr->subclass == AST_CONTROL_UNHOLD) ||
(fr->subclass == AST_CONTROL_VIDUPDATE)) { (fr->subclass == AST_CONTROL_VIDUPDATE)) {
ast_indicate(other, fr->subclass); ast_indicate_data(other, fr->subclass, fr->data, fr->datalen);
ast_frfree(fr); ast_frfree(fr);
} else { } else {
*fo = fr; *fo = fr;
@@ -3145,7 +3145,7 @@ static enum ast_bridge_result bridge_p2p_loop(struct ast_channel *c0, struct ast
p0_callback = p2p_callback_enable(c0, p0, &p0_iod[0]); p0_callback = p2p_callback_enable(c0, p0, &p0_iod[0]);
p1_callback = p2p_callback_enable(c1, p1, &p1_iod[0]); p1_callback = p2p_callback_enable(c1, p1, &p1_iod[0]);
} }
ast_indicate(other, fr->subclass); ast_indicate_data(other, fr->subclass, fr->data, fr->datalen);
ast_frfree(fr); ast_frfree(fr);
} else { } else {
*fo = fr; *fo = fr;