[FFmpeg-cvslog] pictordec: decode 1bpp / 4bpp images when extra header marker is missing

[Piotr Bandurski]

ffmpeg | branch: master | Piotr Bandurski <ami_stuff at o2.pl> | Mon Oct 29 18:43:42 2012 +0100| [bf0d098a98864a90b67bad53418fb6d46650f193] | committer: Michael Niedermayer

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 at xvid.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bf0d098a98864a90b67bad53418fb6d46650f193
---

 libavcodec/pictordec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c
index ad8eae0..5c872c9 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);