diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-05-13 14:17:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-05-13 14:44:55 +0200 |
| commit | f119d7526e752375d723a28f88df044c2f36d886 (patch) | |
| tree | 4c01c74015300ae24b43405eb0b6332e50bd7c9b /libavcodec/adpcm.c | |
| parent | 43d70feb788318b124418c5c666f2120ee5ca930 (diff) | |
| download | ffmpeg-f119d7526e752375d723a28f88df044c2f36d886.tar.gz | |
Revert "avcodec/adpcm: Set vqa_version before use in init"
Redundant with ff946633a30e15415974c3f0ec7751c04eb91701.
Found-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This reverts commit 7a403da0cb8e5fe308fe307b7ed219110f7021e0.
Diffstat (limited to 'libavcodec/adpcm.c')
| -rw-r--r-- | libavcodec/adpcm.c | 2 |
1 files changed, 0 insertions, 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; |