Commit 4413a842 authored by Piotr Bandurski's avatar Piotr Bandurski Committed by Carl Eugen Hoyos

iff: decode HAM8 images with masking correctly.

Fixes ticket #967.

Reviewed-by: Peter Ross
parent 4fecc3cf
...@@ -231,7 +231,7 @@ static int extract_header(AVCodecContext *const avctx, ...@@ -231,7 +231,7 @@ static int extract_header(AVCodecContext *const avctx,
s->transparency = bytestream_get_be16(&buf); s->transparency = bytestream_get_be16(&buf);
s->masking = bytestream_get_byte(&buf); s->masking = bytestream_get_byte(&buf);
if (s->masking == MASK_HAS_MASK) { if (s->masking == MASK_HAS_MASK) {
if (s->bpp >= 8) { if (s->bpp >= 8 && !s->ham) {
avctx->pix_fmt = AV_PIX_FMT_RGB32; avctx->pix_fmt = AV_PIX_FMT_RGB32;
av_freep(&s->mask_buf); av_freep(&s->mask_buf);
av_freep(&s->mask_palbuf); av_freep(&s->mask_palbuf);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment