aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorVitor Sessak <vitor1001@gmail.com>2009-04-27 16:04:43 +0000
committerVitor Sessak <vitor1001@gmail.com>2009-04-27 16:04:43 +0000
commit8a06cb14f9f57f14e0de52451a4554e688bb854a (patch)
treec86f8557c998fe54078f5e30928076bad370bf82 /libavcodec
parentb78c8e2103f5d4511c57c559187f4b66bdb177a4 (diff)
downloadffmpeg-8a06cb14f9f57f14e0de52451a4554e688bb854a.tar.gz
Skip 0x0000 frame footer in EA ADPCM decoder.
Originally committed as revision 18706 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/adpcm.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index a72ee20dab..d923fbe3a0 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -1251,6 +1251,10 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
*samples++ = (unsigned short)current_right_sample;
}
}
+
+ if (src - buf == buf_size - 2)
+ src += 2; // Skip terminating 0x0000
+
break;
case CODEC_ID_ADPCM_EA_MAXIS_XA:
for(channel = 0; channel < avctx->channels; channel++) {