From 4cdb42b428ef425aceeee548af1ee1a8798a02a2 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 13 Jul 2013 16:18:06 +0200 Subject: avcodec/012v: improve stride selection Fixes decoding some files Fixes Ticket2126 Signed-off-by: Michael Niedermayer --- libavcodec/012v.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'libavcodec/012v.c') 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); -- cgit v1.2.3