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 16:06:09 +0100 |
| commit | 620d80d5720e401ce1c01c53850457588c70a84a (patch) | |
| tree | c2689f954df6ce654b99f5a796cfe181e27bfdd9 | |
| parent | e3ce3d373caf29d457d0eb02c707799d141cbd4c (diff) | |
| download | ffmpeg-620d80d5720e401ce1c01c53850457588c70a84a.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 02de22cee7..6fd4675a4f 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -863,6 +863,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: |