From bf0d098a98864a90b67bad53418fb6d46650f193 Mon Sep 17 00:00:00 2001
From: Piotr Bandurski <ami_stuff@o2.pl>
Date: Mon, 29 Oct 2012 18:43:42 +0100
Subject: 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>
---
 libavcodec/pictordec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libavcodec')

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);
-- 
cgit v1.2.3