[asterisk-commits] tilghman: trunk r269976 - in /trunk: ./ main/frame.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Jun 11 13:31:14 2010
New Revision: 269976

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

........
  r269960 | tilghman | 2010-06-11 13:23:05 -0500 (Fri, 11 Jun 2010) | 8 lines
  
  For SpeeX, 0 bits remaining is valid and does not need an emitted warning.
  
  (closes issue #15762)
   Reported by: nblasgen
   Patches: 
         issue15672.patch uploaded by pabelanger (license 224)
   Tested by: nblasgen
........

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

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

Modified: trunk/main/frame.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/frame.c?view=diff&rev=269976&r1=269975&r2=269976
==============================================================================
--- trunk/main/frame.c (original)
+++ trunk/main/frame.c Fri Jun 11 13:31:14 2010
@@ -1406,7 +1406,9 @@
 		}
 		bit += off;
 
-		if ((len * 8 - bit) < 5) {
+		if ((len * 8 - bit) == 0) {
+			break;
+		} else if ((len * 8 - bit) < 5) {
 			ast_log(LOG_WARNING, "Not enough bits remaining after wide band for speex samples.\n");
 			break;
 		}