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

Support transparency in iff images.

Browse Source 
Fixes ticket #707.

Reviewed-by: Peter Ross
This commit is contained in:
Carl Eugen Hoyos 2012-01-14 10:38:42 +01:00
parent 6ba74be511
commit 28002030f2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/iff.c
View File

@ -165,6 +165,9 @@ static int ff_cmap_read_palette(AVCodecContext *avctx, uint32_t *pal)
pal[i] = 0xFF000000 | gray2rgb((i * 255) >> avctx->bits_per_coded_sample); pal[i] = 0xFF000000 | gray2rgb((i * 255) >> avctx->bits_per_coded_sample);
} }
} }
if (s->masking == MASK_HAS_TRANSPARENT_COLOR &&
s->transparency < 1 << avctx->bits_per_coded_sample)
pal[s->transparency] &= 0xFFFFFF;
return 0; return 0;
} }
@ -216,10 +219,7 @@ static int extract_header(AVCodecContext *const avctx,
s->flags = bytestream_get_byte(&buf); s->flags = bytestream_get_byte(&buf);
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_TRANSPARENT_COLOR) { if (s->masking != MASK_NONE && s->masking != MASK_HAS_TRANSPARENT_COLOR) {
av_log(avctx, AV_LOG_ERROR, "Transparency not supported\n");
return AVERROR_PATCHWELCOME;
} else if (s->masking != MASK_NONE) {
av_log(avctx, AV_LOG_ERROR, "Masking not supported\n"); av_log(avctx, AV_LOG_ERROR, "Masking not supported\n");
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }