[svn-commits] file: trunk r48108 - in /trunk: ./ main/rtp.c

[svn-commits at lists.digium.com]

Author: file
Date: Wed Nov 29 10:53:27 2006
New Revision: 48108

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48108
Log:
Merged revisions 48107 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r48107 | file | 2006-11-29 11:50:33 -0500 (Wed, 29 Nov 2006) | 10 lines

Merged revisions 48106 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r48106 | file | 2006-11-29 11:47:10 -0500 (Wed, 29 Nov 2006) | 2 lines

If the frame was duplicated before writing out then we need to free it. (issue #8429 reported by edguy3)

........

................

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=48108&r1=48107&r2=48108
==============================================================================
--- trunk/main/rtp.c (original)
+++ trunk/main/rtp.c Wed Nov 29 10:53:27 2006
@@ -2665,6 +2665,8 @@
 		else
 			f = _f;
 		ast_rtp_raw_write(rtp, f, codec);
+		if (f != _f)
+			ast_frfree(f);
 	}
 		
 	return 0;