diff options
author | Peter Ross <pross@xvid.org> | 2014-03-15 11:16:19 +1100 |
---|---|---|
committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-03-17 15:46:00 +0100 |
commit | 4aab3f868f35b2df0053f840cdfd8186d726905f (patch) | |
tree | 923f86ad895af6d94f2993af3d9f4d72299241c8 | |
parent | 48609236daf85d1974c4a23d22e6eb63d5132c3e (diff) | |
download | ffmpeg-4aab3f868f35b2df0053f840cdfd8186d726905f.tar.gz |
avcodec/adpcm: ADPCM_IMA_DK3 packets are padded to 16-bit packet boundary
Fixes ticket #3461.
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d1bb17940dd242e56541775318636bcbe3eab73d)
-rw-r--r-- | libavcodec/adpcm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 1005a1b443..b34186a46e 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -917,6 +917,9 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, *samples++ = c->status[0].predictor + c->status[1].predictor; *samples++ = c->status[0].predictor - c->status[1].predictor; } + + if ((bytestream2_tell(&gb) & 1)) + bytestream2_skip(&gb, 1); break; } case AV_CODEC_ID_ADPCM_IMA_ISS: |