diff options
| author | Piotr Bandurski <ami_stuff@o2.pl> | 2012-10-29 18:43:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-29 21:32:03 +0100 |
| commit | bf0d098a98864a90b67bad53418fb6d46650f193 (patch) | |
| tree | 830e4133979a642bfccaad3fb935cb8129d0da38 /libavcodec/pictordec.c | |
| parent | a29ed50ed735e168a154f027ba633d9ca92cc4f5 (diff) | |
| download | android_external_ffmpeg-bf0d098a98864a90b67bad53418fb6d46650f193.tar.gz android_external_ffmpeg-bf0d098a98864a90b67bad53418fb6d46650f193.tar.bz2 android_external_ffmpeg-bf0d098a98864a90b67bad53418fb6d46650f193.zip | |
pictordec: decode 1bpp / 4bpp images when extra header marker is missing
based on 56f6628bca66ef3b6a1028fcf0f52dbe01115d89
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>
Diffstat (limited to 'libavcodec/pictordec.c')
| -rw-r--r-- | libavcodec/pictordec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c index ad8eae0b15..5c872c955e 100644 --- a/libavcodec/pictordec.c +++ b/libavcodec/pictordec.c @@ -133,7 +133,7 @@ static int decode_frame(AVCodecContext *avctx, 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); etype = bytestream2_get_le16(&s->g); esize = bytestream2_get_le16(&s->g); |