pictordec: decode 8bpp images when extra header marker is missing
authorPeter Ross <pross@xvid.org>
Sat, 3 Dec 2011 01:21:33 +0000 (12:21 +1100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Dec 2011 02:46:14 +0000 (03:46 +0100)
Fixes ticket #696.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/pictordec.c

index ed372bc..7c95f89 100644 (file)
@@ -130,7 +130,7 @@ static int decode_frame(AVCodecContext *avctx,
         return AVERROR_INVALIDDATA;
     }
 
-    if (*buf == 0xFF) {
+    if (*buf == 0xFF || bpp == 8) {
         buf += 2;
         etype  = bytestream_get_le16(&buf);
         esize  = bytestream_get_le16(&buf);