diff options
| author | Peter Ross <pross@xvid.org> | 2011-12-03 12:21:33 +1100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-03 03:46:14 +0100 |
| commit | 56f6628bca66ef3b6a1028fcf0f52dbe01115d89 (patch) | |
| tree | e7faf5f43875af502c375248c249a25532ae51b9 | |
| parent | 2d6a45c12a9151aa8c3407cd2981a160c71db708 (diff) | |
| download | ffmpeg-56f6628bca66ef3b6a1028fcf0f52dbe01115d89.tar.gz | |
pictordec: decode 8bpp images when extra header marker is missing
Fixes ticket #696.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -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 ed372bc996..7c95f89bbd 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); |