[asterisk-commits] file: branch 1.6.1 r228412 - in /branches/1.6.1: ./ main/abstract_jb.c

[SVN commits to the Asterisk project]

Author: file
Date: Fri Nov  6 10:44:23 2009
New Revision: 228412

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

................
  r228410 | file | 2009-11-06 12:42:23 -0400 (Fri, 06 Nov 2009) | 14 lines
  
  Merged revisions 228409 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r228409 | file | 2009-11-06 12:41:20 -0400 (Fri, 06 Nov 2009) | 7 lines
    
    Fix a bug caused by a partially invalid frame (from the jitterbuffer) passing through the Asterisk core.
    
    (closes issue #15560)
    Reported by: jvandal
    (closes issue #15709)
    Reported by: covici
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/abstract_jb.c

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

Modified: branches/1.6.1/main/abstract_jb.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/abstract_jb.c?view=diff&rev=228412&r1=228411&r2=228412
==============================================================================
--- branches/1.6.1/main/abstract_jb.c (original)
+++ branches/1.6.1/main/abstract_jb.c Fri Nov  6 10:44:23 2009
@@ -386,7 +386,7 @@
 	struct ast_jb *jb = &chan->jb;
 	struct ast_jb_impl *jbimpl = jb->impl;
 	void *jbobj = jb->jbobj;
-	struct ast_frame *f, finterp;
+	struct ast_frame *f, finterp = { .frametype = AST_FRAME_VOICE, };
 	long now;
 	int interpolation_len, res;
 	
@@ -415,13 +415,9 @@
 		case JB_IMPL_INTERP:
 			/* interpolate a frame */
 			f = &finterp;
-			f->frametype = AST_FRAME_VOICE;
 			f->subclass = jb->last_format;
-			f->datalen  = 0;
 			f->samples  = interpolation_len * 8;
-			f->mallocd  = 0;
 			f->src  = "JB interpolation";
-			f->data.ptr  = NULL;
 			f->delivery = ast_tvadd(jb->timebase, ast_samp2tv(jb->next, 1000));
 			f->offset = AST_FRIENDLY_OFFSET;
 			/* deliver the interpolated frame */