diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-06-11 18:31:14 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-06-11 18:31:14 +0000 |
| commit | 479ce4351e91b18f0e9ca6ba83e0fa7a1c60e8ff (patch) | |
| tree | 78deceac16eb0136bb38b6ece8888fc5d602d137 /main/frame.c | |
| parent | d66b4616f04630fb38917680d994fd74c19f9380 (diff) | |
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
Diffstat (limited to 'main/frame.c')
| -rw-r--r-- | main/frame.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; } |