From 479ce4351e91b18f0e9ca6ba83e0fa7a1c60e8ff Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Fri, 11 Jun 2010 18:31:14 +0000 Subject: 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 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@269976 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/frame.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/main/frame.c b/main/frame.c index af782edc2..a4a7f2d32 100644 --- a/main/frame.c +++ b/main/frame.c @@ -1406,7 +1406,9 @@ static int speex_samples(unsigned char *data, int len) } 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; } -- cgit v1.2.3