aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2010-02-02 22:57:56 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2010-02-02 22:57:56 +0000
commit36cbdc95393117d36885c9ba06f0df62f50cc46c (patch)
treebf93df024097dad2b699aff9d9120e36bb3e2ffc /libavcodec
parent48ff3f7cc889f4efc06b2bf4c4e44935e7f63cfb (diff)
downloadffmpeg-36cbdc95393117d36885c9ba06f0df62f50cc46c.tar.gz
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
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/rawdec.c3
1 files changed, 2 insertions, 1 deletions
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))