[FFmpeg-cvslog] avcodec/adpcm: pick correct step_index for IMA AMV

Paul B Mahol git at videolan.org
Thu May 19 23:48:33 CEST 2016


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Thu May 19 16:40:07 2016 +0200| [14992421df88514e64fb56cfa888eade918cfc19] | committer: Paul B Mahol

avcodec/adpcm: pick correct step_index for IMA AMV

Fixes #5538

Signed-off-by: Paul B Mahol <onemda at gmail.com>

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

 libavcodec/adpcm.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 0b6b92e..ac74318 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -1310,8 +1310,8 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data,
         break;
     case AV_CODEC_ID_ADPCM_IMA_AMV:
         c->status[0].predictor = sign_extend(bytestream2_get_le16u(&gb), 16);
-        c->status[0].step_index = bytestream2_get_le16u(&gb);
-        bytestream2_skipu(&gb, 4);
+        c->status[0].step_index = bytestream2_get_byteu(&gb);
+        bytestream2_skipu(&gb, 5);
         if (c->status[0].step_index > 88u) {
             av_log(avctx, AV_LOG_ERROR, "ERROR: step_index = %i\n",
                    c->status[0].step_index);



More information about the ffmpeg-cvslog mailing list