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

[Peter Ross]

ffmpeg | branch: master | Peter Ross <pross at xvid.org> | Sat Dec  3 12:21:33 2011 +1100| [56f6628bca66ef3b6a1028fcf0f52dbe01115d89] | committer: Michael Niedermayer

pictordec: decode 8bpp images when extra header marker is missing

Fixes ticket #696.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/pictordec.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c
index ed372bc..7c95f89 100644
--- a/libavcodec/pictordec.c
+++ b/libavcodec/pictordec.c
@@ -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);