Merged revisions 85057 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Mon, 8 Oct 2007 20:09:02 +0000 (20:09 +0000)
committerJoshua Colp <jcolp@digium.com>
Mon, 8 Oct 2007 20:09:02 +0000 (20:09 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r85057 | file | 2007-10-08 17:06:33 -0300 (Mon, 08 Oct 2007) | 4 lines

Only update codec information if the channel has a technology private structure.
(issue #10915)
Reported by: ramonpeek

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85058 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/rtp.c

index 1e16505..56aabda 100644 (file)
@@ -3345,9 +3345,9 @@ static enum ast_bridge_result bridge_native_loop(struct ast_channel *c0, struct
                                ast_rtp_get_peer(p1, &t1);
                                memcpy(&ac1, &t1, sizeof(ac1));
                                /* Update codec information */
-                               if (pr0->get_codec)
+                               if (pr0->get_codec && c0->tech_pvt)
                                        oldcodec0 = codec0 = pr0->get_codec(c0);
-                               if (pr1->get_codec)
+                               if (pr1->get_codec && c1->tech_pvt)
                                        oldcodec1 = codec1 = pr1->get_codec(c1);
                                ast_indicate_data(other, fr->subclass, fr->data, fr->datalen);
                                ast_frfree(fr);