diff options
| author | Vitor Sessak <vitor1001@gmail.com> | 2009-04-27 20:04:43 +0400 |
|---|---|---|
| committer | Vitor Sessak <vitor1001@gmail.com> | 2009-04-27 20:04:43 +0400 |
| commit | 8a06cb14f9f57f14e0de52451a4554e688bb854a (patch) | |
| tree | c86f8557c998fe54078f5e30928076bad370bf82 /libavcodec/adpcm.c | |
| parent | b78c8e2103f5d4511c57c559187f4b66bdb177a4 (diff) | |
Skip 0x0000 frame footer in EA ADPCM decoder.
Originally committed as revision 18706 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/adpcm.c')
| -rw-r--r-- | libavcodec/adpcm.c | 4 |
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++) { |