[FFmpeg-cvslog] avcodec/adpcm: ADPCM_IMA_DK3 packets are padded to 16-bit packet boundary

[Peter Ross]

ffmpeg | branch: master | Peter Ross <pross at xvid.org> | Sat Mar 15 11:16:19 2014 +1100| [d1bb17940dd242e56541775318636bcbe3eab73d] | committer: Michael Niedermayer

avcodec/adpcm: ADPCM_IMA_DK3 packets are padded to 16-bit packet boundary

Fixes ticket #3461.

Signed-off-by: Peter Ross <pross at xvid.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d1bb17940dd242e56541775318636bcbe3eab73d
---

 libavcodec/adpcm.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 56431cf..f7f8259 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: