From: Zane van Iperen Date: Thu, 18 Feb 2021 03:47:13 +0000 (+1000) Subject: avcodec/adpcm_ima_apm: remove old extradata format X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=a859e57424ca0a00d17bdc034c52005c18184961;p=ffmpeg avcodec/adpcm_ima_apm: remove old extradata format 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, Reviewed-by: Andreas Rheinhardt Signed-off-by: Zane van Iperen --- diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 16e015b0f81..8d94cefa0ee 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -2107,11 +2107,6 @@ static void adpcm_flush(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;