summaryrefslogtreecommitdiff
path: root/main/rtp.c
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2007-10-08 15:39:23 +0000
committerJoshua Colp <jcolp@digium.com>2007-10-08 15:39:23 +0000
commitde64c85b54242e9621bbc1de7e68b055036849af (patch)
tree33ba4110e5091bb280bf71c801f209bbdea89407 /main/rtp.c
parent914cd4a7cf5efaf4f92873e4b95d2df41e3867a8 (diff)
Merged revisions 85023 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r85023 | file | 2007-10-08 12:37:46 -0300 (Mon, 08 Oct 2007) | 4 lines Update codec information as well as address when doing hold reinvites. (issue #10868) Reported by: mavince ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85024 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/rtp.c')
-rw-r--r--main/rtp.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/main/rtp.c b/main/rtp.c
index 3831baaef..1e16505d4 100644
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -3344,6 +3344,11 @@ static enum ast_bridge_result bridge_native_loop(struct ast_channel *c0, struct
memcpy(&ac0, &t0, sizeof(ac0));
ast_rtp_get_peer(p1, &t1);
memcpy(&ac1, &t1, sizeof(ac1));
+ /* Update codec information */
+ if (pr0->get_codec)
+ oldcodec0 = codec0 = pr0->get_codec(c0);
+ if (pr1->get_codec)
+ oldcodec1 = codec1 = pr1->get_codec(c1);
ast_indicate_data(other, fr->subclass, fr->data, fr->datalen);
ast_frfree(fr);
} else {