ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Thu May 13 14:17:46 2021 +0200| [f119d7526e752375d723a28f88df044c2f36d886] | committer: Michael Niedermayer
Revert "avcodec/adpcm: Set vqa_version before use in init" Redundant with ff946633a30e15415974c3f0ec7751c04eb91701. Found-by: Andreas Rheinhardt <[email protected]> This reverts commit 7a403da0cb8e5fe308fe307b7ed219110f7021e0. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f119d7526e752375d723a28f88df044c2f36d886 --- libavcodec/adpcm.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 5e0a654caf..94e1fade28 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -193,8 +193,6 @@ static av_cold int adpcm_decode_init(AVCodecContext * avctx) avctx->sample_fmt = AV_SAMPLE_FMT_S16P; break; case AV_CODEC_ID_ADPCM_IMA_WS: - if (avctx->extradata && avctx->extradata_size >= 2) - c->vqa_version = AV_RL16(avctx->extradata); avctx->sample_fmt = c->vqa_version == 3 ? AV_SAMPLE_FMT_S16P : AV_SAMPLE_FMT_S16; break; _______________________________________________ ffmpeg-cvslog mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
