From: Paul B Mahol <onemda@gmail.com>
Date: Sun, 19 Jun 2016 07:43:22 +0000 (+0200)
Subject: avcodec/magicyuv: check dimensions
X-Git-Tag: android-x86-7.1-r1~4851
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8a135a55b3570441b6147c94f24c71e5c81ac916;p=android-x86%2Fexternal-ffmpeg.git

avcodec/magicyuv: check dimensions

Signed-off-by: Paul B Mahol <onemda@gmail.com>
---

diff --git a/libavcodec/magicyuv.c b/libavcodec/magicyuv.c
index cd703e7c8a..ce0ea9b84a 100644
--- a/libavcodec/magicyuv.c
+++ b/libavcodec/magicyuv.c
@@ -309,8 +309,9 @@ static int decode_frame(AVCodecContext *avctx,
     s->interlaced = !!(bytestream2_get_byte(&gb) & 2);
     bytestream2_skip(&gb, 3);
 
-    avctx->coded_width  = bytestream2_get_le32(&gb);
-    avctx->coded_height = bytestream2_get_le32(&gb);
+    if ((ret = ff_set_dimensions(avctx, bytestream2_get_le32(&gb), bytestream2_get_le32(&gb))) < 0)
+        return ret;
+
     slice_width = bytestream2_get_le32(&gb);
     if (slice_width != avctx->coded_width) {
         avpriv_request_sample(avctx, "unsupported slice width: %d", slice_width);