[asterisk-commits] twilson: branch 1.6.0 r113598 - in /branches/1.6.0: ./ channels/chan_iax2.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Tue Apr  8 20:40:50 2008
New Revision: 113598

URL: http://svn.digium.com/view/asterisk?view=rev&rev=113598
Log:
Merged revisions 113597 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r113597 | twilson | 2008-04-08 20:36:58 -0500 (Tue, 08 Apr 2008) | 10 lines

Merged revisions 113596 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r113596 | twilson | 2008-04-08 20:34:25 -0500 (Tue, 08 Apr 2008) | 2 lines

Initialize fr->cacheable to make valgrind happy

........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_iax2.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_iax2.c?view=diff&rev=113598&r1=113597&r2=113598
==============================================================================
--- branches/1.6.0/channels/chan_iax2.c (original)
+++ branches/1.6.0/channels/chan_iax2.c Tue Apr  8 20:40:50 2008
@@ -9199,6 +9199,7 @@
 			ast_debug(1, "Received out of order packet... (type=%d, subclass %d, ts = %d, last = %d)\n", f.frametype, f.subclass, fr->ts, iaxs[fr->callno]->last);
 		fr->outoforder = -1;
 	}
+	fr->cacheable = ((f.frametype == AST_FRAME_VOICE) || (f.frametype == AST_FRAME_VIDEO));
 	duped_fr = iaxfrdup2(fr);
 	if (duped_fr) {
 		schedule_delivery(duped_fr, updatehistory, 0, &fr->ts);