[asterisk-commits] file: trunk r85058 - in /trunk: ./ main/rtp.c

[SVN commits to the Asterisk project]

Author: file
Date: Mon Oct  8 15:09:02 2007
New Revision: 85058

URL: http://svn.digium.com/view/asterisk?view=rev&rev=85058
Log:
Merged revisions 85057 via svnmerge from 
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

........

Modified:
    trunk/   (props changed)
    trunk/main/rtp.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/rtp.c
URL: http://svn.digium.com/view/asterisk/trunk/main/rtp.c?view=diff&rev=85058&r1=85057&r2=85058
==============================================================================
--- trunk/main/rtp.c (original)
+++ trunk/main/rtp.c Mon Oct  8 15:09:02 2007
@@ -3345,9 +3345,9 @@
 				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);