aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-08-15 14:54:36 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-11-19 03:51:37 +0100
commit6c32c9e1eff37a8e2e9d5444be1a1e0db652d27e (patch)
tree13474b8cfd1ee2ed8c7281bcbb24503a72a5aa17
parentdd19374ed71a6bc05c5a899decee9bdb40752e5e (diff)
downloadffmpeg-6c32c9e1eff37a8e2e9d5444be1a1e0db652d27e.tar.gz
avcodec/svq1enc: Check dimensions
Fixes assertion failure Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 88fe45e0fe379d7ea86c8ac1e1e8cf2c3f62389f) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/svq1enc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c
index ec540a25e3..bd35e31bce 100644
--- a/libavcodec/svq1enc.c
+++ b/libavcodec/svq1enc.c
@@ -516,6 +516,11 @@ static av_cold int svq1_encode_init(AVCodecContext *avctx)
SVQ1EncContext *const s = avctx->priv_data;
int ret;
+ if (avctx->width >= 4096 || avctx->height >= 4096) {
+ av_log(avctx, AV_LOG_ERROR, "Dimensions too large, maximum is 4095x4095\n");
+ return AVERROR(EINVAL);
+ }
+
ff_hpeldsp_init(&s->hdsp, avctx->flags);
ff_me_cmp_init(&s->mecc, avctx);
ff_mpegvideoencdsp_init(&s->m.mpvencdsp, avctx);