From 1e28fa21de232ba4f37c23eb052465fc07bc1507 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 2 Jan 2013 03:52:54 +0100 Subject: [PATCH] rawdec: fix NV12 Fixes Ticket646 Signed-off-by: Michael Niedermayer --- libavcodec/rawdec.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index af42114138..a4cb151197 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -237,6 +237,15 @@ static int raw_decode(AVCodecContext *avctx, FFALIGN(frame->linesize[0], linesize_align)*avctx->height <= buf_size) frame->linesize[0] = FFALIGN(frame->linesize[0], linesize_align); + if(avctx->pix_fmt == AV_PIX_FMT_NV12 && avctx->codec_tag == MKTAG('N', 'V', '1', '2') && + FFALIGN(frame->linesize[0], linesize_align)*avctx->height + + FFALIGN(frame->linesize[1], linesize_align)*((avctx->height+1)/2) <= buf_size) { + int la0 = FFALIGN(frame->linesize[0], linesize_align); + frame->data[1] += (la0 - frame->linesize[0])*avctx->height; + frame->linesize[0] = la0; + frame->linesize[1] = FFALIGN(frame->linesize[1], linesize_align); + } + if(context->flip) flip(avctx, picture);