From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 13 Jul 2013 14:18:06 +0000 (+0200)
Subject: avcodec/012v: improve stride selection
X-Git-Tag: android-x86-4.4-r1~2371
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4cdb42b428ef425aceeee548af1ee1a8798a02a2;p=android-x86%2Fexternal-ffmpeg.git

avcodec/012v: improve stride selection

Fixes decoding some files
Fixes Ticket2126

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libavcodec/012v.c b/libavcodec/012v.c
index 58e3cd6fbd..f694769089 100644
--- a/libavcodec/012v.c
+++ b/libavcodec/012v.c
@@ -49,6 +49,12 @@ static int zero12v_decode_frame(AVCodecContext *avctx, void *data,
         av_log(avctx, AV_LOG_ERROR, "Width 1 not supported.\n");
         return AVERROR_INVALIDDATA;
     }
+
+    if (   avctx->codec_tag == MKTAG('0', '1', '2', 'v')
+        && avpkt->size % avctx->height == 0
+        && avpkt->size / avctx->height * 3 >= width * 8)
+        stride = avpkt->size / avctx->height;
+
     if (avpkt->size < avctx->height * stride) {
         av_log(avctx, AV_LOG_ERROR, "Packet too small: %d instead of %d\n",
                avpkt->size, avctx->height * stride);