OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ff5790c
)
adpcmdec: check remaining buffer size before decoding next block in the
author
Justin Ruggles
<justin.ruggles@gmail.com>
Sun, 2 Oct 2011 20:07:55 +0000
(16:07 -0400)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Fri, 14 Oct 2011 19:53:41 +0000
(15:53 -0400)
ADPCM IMA WAV decoder.
libavcodec/adpcm.c
patch
|
blob
|
history
diff --git
a/libavcodec/adpcm.c
b/libavcodec/adpcm.c
index
200957b
..
774193e
100644
(file)
--- a/
libavcodec/adpcm.c
+++ b/
libavcodec/adpcm.c
@@
-431,7
+431,7
@@
static int adpcm_decode_frame(AVCodecContext *avctx,
if (*src++) av_log(avctx, AV_LOG_ERROR, "unused byte should be null but is %d!!\n", src[-1]); /* unused */
}
- while
(src < buf + buf_size)
{
+ while
(src <= buf + buf_size - (avctx->channels * 4))
{
for (i = 0; i < avctx->channels; i++) {
cs = &c->status[i];
for (m = 0; m < 4; m++) {