virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

pictordec: decode 1bpp / 4bpp images when extra header marker is missing

Browse Source 
based on 56f6628bca

samples:

http://www.datafilehost.com/download-94b5bc1b.html

Reviewed-and-Tested-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Piotr Bandurski
2012-10-29 18:43:42 +01:00
committed by Michael Niedermayer
parent a29ed50ed7
commit bf0d098a98
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/pictordec.c
View File

@@ -133,7 +133,7 @@ static int decode_frame(AVCodecContext *avctx,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (bytestream2_peek_byte(&s->g) == 0xFF || bpp == 8) { if (bytestream2_peek_byte(&s->g) == 0xFF || bpp == 1 || bpp == 4 || bpp == 8) {
bytestream2_skip(&s->g, 2); bytestream2_skip(&s->g, 2);
etype = bytestream2_get_le16(&s->g); etype = bytestream2_get_le16(&s->g);
esize = bytestream2_get_le16(&s->g); esize = bytestream2_get_le16(&s->g);