Merge commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d'

[ffmpeg] / libavcodec / mss12.c

diff --git a/libavcodec/mss12.c b/libavcodec/mss12.c
index 6b58aa29551119465dc6ddf4ef4af3a845342696..d42093b0a30cdd49524fd0ac074da8e429443157 100644 (file)
--- a/libavcodec/mss12.c
+++ b/libavcodec/mss12.c
@@ -581,8 +581,8 @@ av_cold int ff_mss12_decode_init(MSS12Context *c, int version,
         return AVERROR_INVALIDDATA;
     }
 
-    avctx->coded_width  = AV_RB32(avctx->extradata + 20);
-    avctx->coded_height = AV_RB32(avctx->extradata + 24);
+    avctx->coded_width  = FFMAX(AV_RB32(avctx->extradata + 20), avctx->width);
+    avctx->coded_height = FFMAX(AV_RB32(avctx->extradata + 24), avctx->height);
     if (avctx->coded_width > 4096 || avctx->coded_height > 4096) {
         av_log(avctx, AV_LOG_ERROR, "Frame dimensions %dx%d too large",
                avctx->coded_width, avctx->coded_height);