[FFmpeg-cvslog] Support transparency in iff images.
Carl Eugen Hoyos
git at videolan.org
Sat Jan 14 10:41:24 CET 2012
ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sat Jan 14 10:38:42 2012 +0100| [28002030f22a18f8086dff4ba5bc18940584445c] | committer: Carl Eugen Hoyos
Support transparency in iff images.
Fixes ticket #707.
Reviewed-by: Peter Ross
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=28002030f22a18f8086dff4ba5bc18940584445c
---
libavcodec/iff.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavcodec/iff.c b/libavcodec/iff.c
index 7a11d43..c0e4eb4 100644
--- a/libavcodec/iff.c
+++ b/libavcodec/iff.c
@@ -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);
}
}
+ if (s->masking == MASK_HAS_TRANSPARENT_COLOR &&
+ s->transparency < 1 << avctx->bits_per_coded_sample)
+ pal[s->transparency] &= 0xFFFFFF;
return 0;
}
@@ -216,10 +219,7 @@ static int extract_header(AVCodecContext *const avctx,
s->flags = bytestream_get_byte(&buf);
s->transparency = bytestream_get_be16(&buf);
s->masking = bytestream_get_byte(&buf);
- if (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) {
+ if (s->masking != MASK_NONE && s->masking != MASK_HAS_TRANSPARENT_COLOR) {
av_log(avctx, AV_LOG_ERROR, "Masking not supported\n");
return AVERROR_PATCHWELCOME;
}
More information about the ffmpeg-cvslog
mailing list