virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

iff: decode HAM8 images with masking correctly.

Browse Source 
Fixes ticket #967.

Reviewed-by: Peter Ross
This commit is contained in:
Piotr Bandurski 2012-11-18 15:48:22 +01:00 committed by Carl Eugen Hoyos
parent 4fecc3cf09
commit 4413a8428a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/iff.c
View File

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