[FFmpeg-cvslog] avcodec/adpcm_ima_apm: remove old extradata format

[Zane van Iperen]

ffmpeg | branch: master | Zane van Iperen <zane at zanevaniperen.com> | Thu Feb 18 13:47:13 2021 +1000| [a859e57424ca0a00d17bdc034c52005c18184961] | committer: Zane van Iperen

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 <andreas.rheinhardt at outlook.com>
Signed-off-by: Zane van Iperen <zane at zanevaniperen.com>

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

 libavcodec/adpcm.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 16e015b0f8..8d94cefa0e 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;