diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2010-01-16 10:46:45 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2010-01-16 10:46:45 +0000 |
| commit | 864a0742134187260257396d9de3c8c06d5d1122 (patch) | |
| tree | 10a2d5e458048261e6944b2b29ae965ff69d5082 /libavcodec/rawdec.c | |
| parent | dd08b83c876275ae4741225a4820997c935b956d (diff) | |
| download | ffmpeg-864a0742134187260257396d9de3c8c06d5d1122.tar.gz | |
Correctly decode some Avid AV1x samples, fixes issue 1684.
Originally committed as revision 21241 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/rawdec.c')
| -rw-r--r-- | libavcodec/rawdec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index fe96440fce..20c21263b5 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -137,6 +137,9 @@ static int raw_decode(AVCodecContext *avctx, buf= dst; } + if(avctx->codec_tag == MKTAG('A', 'V', '1', 'x')) + buf += buf_size - context->length; + if(buf_size < context->length - (avctx->pix_fmt==PIX_FMT_PAL8 ? 256*4 : 0)) return -1; |