virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity

avcodec/vp3: Don't try to decode VP4 when VP4 decoder is disabled

Browse Source 
Otherwise decoding will crash lateron; e.g. because dct_tokens
is never set or because a VLC that has not been allocated is used.

Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-05-08 02:08:05 +02:00
parent af7468a282
commit 9afb291267
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/vp3.c
View File

@ -2335,9 +2335,13 @@ static av_cold int vp3_decode_init(AVCodecContext *avctx)
if (ret < 0)
return ret;
if (avctx->codec_tag == MKTAG('V', 'P', '4', '0'))
if (avctx->codec_tag == MKTAG('V', 'P', '4', '0')) {
s->version = 3;
else if (avctx->codec_tag == MKTAG('V', 'P', '3', '0'))
#if !CONFIG_VP4_DECODER
av_log(avctx, AV_LOG_ERROR, "This build does not support decoding VP4.\n");
return AVERROR_DECODER_NOT_FOUND;
#endif
} else if (avctx->codec_tag == MKTAG('V', 'P', '3', '0'))
s->version = 0;
else
s->version = 1;