diff options
| author | Piotr Bandurski <ami_stuff@o2.pl> | 2012-11-18 15:48:22 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-11-18 15:48:22 +0100 |
| commit | 4413a8428a759d33ea58a0617551ba522833f87b (patch) | |
| tree | 24c3165f2c7fb4078d19ef455d75e08d0db7c7dd /libavcodec/iff.c | |
| parent | 4fecc3cf0998927456a9f8d8334587dd64154ec5 (diff) | |
| download | ffmpeg-4413a8428a759d33ea58a0617551ba522833f87b.tar.gz | |
iff: decode HAM8 images with masking correctly.
Fixes ticket #967.
Reviewed-by: Peter Ross
Diffstat (limited to 'libavcodec/iff.c')
| -rw-r--r-- | libavcodec/iff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/iff.c b/libavcodec/iff.c index 9184015d50..9582f9d25d 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -231,7 +231,7 @@ static int extract_header(AVCodecContext *const avctx, s->transparency = bytestream_get_be16(&buf); s->masking = bytestream_get_byte(&buf); if (s->masking == MASK_HAS_MASK) { - if (s->bpp >= 8) { + if (s->bpp >= 8 && !s->ham) { avctx->pix_fmt = AV_PIX_FMT_RGB32; av_freep(&s->mask_buf); av_freep(&s->mask_palbuf); |