[asterisk-commits] file: branch 1.6.1 r195209 - in /branches/1.6.1: ./ main/frame.c

[SVN commits to the Asterisk project]

Author: file
Date: Mon May 18 10:55:45 2009
New Revision: 195209

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=195209
Log:
Merged revisions 195207 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r195207 | file | 2009-05-18 12:53:26 -0300 (Mon, 18 May 2009) | 14 lines
  
  Merged revisions 195206 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r195206 | file | 2009-05-18 12:51:22 -0300 (Mon, 18 May 2009) | 7 lines
    
    Fix a typo which caused loss of audio when using G729 in some scenarios with a smoother present.
    
    (closes issue #15105)
    Reported by: bamby
    Patches:
          process-vad-correctly.diff uploaded by bamby (license 430)
  ........
................

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

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

Modified: branches/1.6.1/main/frame.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/frame.c?view=diff&rev=195209&r1=195208&r2=195209
==============================================================================
--- branches/1.6.1/main/frame.c (original)
+++ branches/1.6.1/main/frame.c Mon May 18 10:55:45 2009
@@ -254,7 +254,7 @@
 	/* Make sure we have enough data */
 	if (s->len < s->size) {
 		/* Or, if this is a G.729 frame with VAD on it, send it immediately anyway */
-		if (!((s->flags & AST_SMOOTHER_FLAG_G729) && (s->size % 10)))
+		if (!((s->flags & AST_SMOOTHER_FLAG_G729) && (s->len % 10)))
 			return NULL;
 	}
 	len = s->size;