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

[Peter Ross]

On Mon, Oct 29, 2012 at 06:43:42PM +0100, Piotr Bandurski wrote:
> based on 56f6628bca66ef3b6a1028fcf0f52dbe01115d89
> 
> samples:
> 
> http://www.datafilehost.com/download-94b5bc1b.html

> 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);

Patch tested. Looks good.

-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20121030/7a956be7/attachment.asc>