[FFmpeg-devel] [PATCH 1/2] avcodec/adpcm_ima_apm: remove old extradata format

Zane van Iperen zane at zanevaniperen.com
Mon Feb 22 05:01:43 EET 2021


Was added in error very early on, passing in only the required fields.
Later, the muxer and demuxer were changed to pass the entire APMState
struct as extradata.

Technically a breaking change, but this was only around for a *very* short
time before it was updated,

Signed-off-by: Zane van Iperen <zane at zanevaniperen.com>
---
 libavcodec/adpcm.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index eb228cc47a..e38e81310c 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -171,11 +171,6 @@ static av_cold int adpcm_decode_init(AVCodecContext * avctx)
                 c->status[0].step_index = av_clip(AV_RL32(avctx->extradata + 20), 0, 88);
                 c->status[1].predictor  = av_clip_intp2(AV_RL32(avctx->extradata + 4), 18);
                 c->status[1].step_index = av_clip(AV_RL32(avctx->extradata + 8), 0, 88);
-            } else if (avctx->extradata_size >= 16) {
-                c->status[0].predictor  = av_clip_intp2(AV_RL32(avctx->extradata +  0), 18);
-                c->status[0].step_index = av_clip(AV_RL32(avctx->extradata +  4), 0, 88);
-                c->status[1].predictor  = av_clip_intp2(AV_RL32(avctx->extradata +  8), 18);
-                c->status[1].step_index = av_clip(AV_RL32(avctx->extradata + 12), 0, 88);
             }
         }
         break;
-- 
2.29.2



More information about the ffmpeg-devel mailing list