aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-08-22 19:39:29 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-09-05 19:45:53 +0200
commit8a1a9588fb44dd35bc42f39212b2ebef8208e945 (patch)
tree46c6147e5bd19ea68498ab0417daa94b29eea2f6 /libavcodec
parent9d3ddef519e88c40c05be8cb94cd9e71c0957ec7 (diff)
downloadffmpeg-8a1a9588fb44dd35bc42f39212b2ebef8208e945.tar.gz
avcodec/vqavideo: Limit resolution
Fixes: Timeout (288sec -> 1ms) Fixes: 16353/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VQA_fuzzer-5633402606190592 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/vqavideo.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c
index b9743abda9..f45390cfe5 100644
--- a/libavcodec/vqavideo.c
+++ b/libavcodec/vqavideo.c
@@ -637,6 +637,11 @@ static av_cold int vqa_decode_end(AVCodecContext *avctx)
return 0;
}
+static const AVCodecDefault vqa_defaults[] = {
+ { "max_pixels", "320*240" },
+ { NULL },
+};
+
AVCodec ff_vqa_decoder = {
.name = "vqavideo",
.long_name = NULL_IF_CONFIG_SMALL("Westwood Studios VQA (Vector Quantized Animation) video"),
@@ -647,4 +652,5 @@ AVCodec ff_vqa_decoder = {
.close = vqa_decode_end,
.decode = vqa_decode_frame,
.capabilities = AV_CODEC_CAP_DR1,
+ .defaults = vqa_defaults,
};