diff options
| author | Peter Ross <pross@xvid.org> | 2014-03-15 11:16:19 +1100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-15 01:34:42 +0100 |
| commit | d1bb17940dd242e56541775318636bcbe3eab73d (patch) | |
| tree | adb8f9585412c805b0f4cd3a87baea6843c7c0c4 /libavcodec/adpcm.c | |
| parent | 41d08ca57564e1b9d8a4a12cfafe67a2a85914aa (diff) | |
| download | ffmpeg-d1bb17940dd242e56541775318636bcbe3eab73d.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>
Diffstat (limited to 'libavcodec/adpcm.c')
| -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 56431cf078..f7f82599b0 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -922,6 +922,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: |