From 36cbdc95393117d36885c9ba06f0df62f50cc46c Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Tue, 2 Feb 2010 22:57:56 +0000 Subject: [PATCH] Fix r21223: AVup samples (issue 1685) need a buf offset like AV1x (issue 1684). Originally committed as revision 21617 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/rawdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index 20c21263b5..b4c7b3c6d8 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -137,7 +137,8 @@ static int raw_decode(AVCodecContext *avctx, buf= dst; } - if(avctx->codec_tag == MKTAG('A', 'V', '1', 'x')) + if(avctx->codec_tag == MKTAG('A', 'V', '1', 'x') || + avctx->codec_tag == MKTAG('A', 'V', 'u', 'p')) buf += buf_size - context->length; if(buf_size < context->length - (avctx->pix_fmt==PIX_FMT_PAL8 ? 256*4 : 0))