From 8a06cb14f9f57f14e0de52451a4554e688bb854a Mon Sep 17 00:00:00 2001 From: Vitor Sessak Date: Mon, 27 Apr 2009 16:04:43 +0000 Subject: [PATCH] Skip 0x0000 frame footer in EA ADPCM decoder. Originally committed as revision 18706 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/adpcm.c | 4 ++++ 1 file changed, 4 insertions(+) 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++) {