aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-03-05 12:51:22 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2019-03-14 16:54:10 +0100
commit04ce4cc0728e35d908da7f5e1aa71f9adf0b65de (patch)
tree76c6699a444aab5685ceb75cb1497d1aa9989a21
parent5d208aac52538e67d76c3fdd173e24ada876ca47 (diff)
downloadffmpeg-04ce4cc0728e35d908da7f5e1aa71f9adf0b65de.tar.gz
avcodec/cdgraphics: Use ff_set_dimensions()
Fixes: Timeout (17 sec -> 65 milli sec) Fixes: 13264/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CDGRAPHICS_fuzzer-5711167941509120 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 9a9f0e239c1c6f5c96cc90ba673087f86ca1eabc) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/cdgraphics.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/libavcodec/cdgraphics.c b/libavcodec/cdgraphics.c
index be85e54288..cf3f01a417 100644
--- a/libavcodec/cdgraphics.c
+++ b/libavcodec/cdgraphics.c
@@ -81,11 +81,8 @@ static av_cold int cdg_decode_init(AVCodecContext *avctx)
return AVERROR(ENOMEM);
cc->transparency = -1;
- avctx->width = CDG_FULL_WIDTH;
- avctx->height = CDG_FULL_HEIGHT;
avctx->pix_fmt = AV_PIX_FMT_PAL8;
-
- return 0;
+ return ff_set_dimensions(avctx, CDG_FULL_WIDTH, CDG_FULL_HEIGHT);
}
static void cdg_border_preset(CDGraphicsContext *cc, uint8_t *data)