[asterisk-commits] tilghman: branch 1.6.2 r269977 - in /branches/1.6.2: ./ main/frame.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Jun 11 13:32:13 2010
New Revision: 269977

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

................
  r269976 | tilghman | 2010-06-11 13:31:14 -0500 (Fri, 11 Jun 2010) | 15 lines
  
  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:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/frame.c

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

Modified: branches/1.6.2/main/frame.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/frame.c?view=diff&rev=269977&r1=269976&r2=269977
==============================================================================
--- branches/1.6.2/main/frame.c (original)
+++ branches/1.6.2/main/frame.c Fri Jun 11 13:32:13 2010
@@ -1394,7 +1394,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;
 		}