[FFmpeg-cvslog] Match documentation for transparency in BGR32 iff images.

Carl Eugen Hoyos git at videolan.org
Mon Mar 19 09:51:11 CET 2012


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Mon Mar 19 09:49:33 2012 +0100| [0d293880bab201f2e342496d8d573cfe0a645461] | committer: Carl Eugen Hoyos

Match documentation for transparency in BGR32 iff images.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0d293880bab201f2e342496d8d573cfe0a645461
---

 libavcodec/iff.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/libavcodec/iff.c b/libavcodec/iff.c
index 925d928..ae47949 100644
--- a/libavcodec/iff.c
+++ b/libavcodec/iff.c
@@ -506,10 +506,15 @@ static int decode_frame_ilbm(AVCodecContext *avctx,
         }
     } else if (avctx->codec_tag == MKTAG('D','E','E','P')) {
         int raw_width = avctx->width * (av_get_bits_per_pixel(&av_pix_fmt_descriptors[avctx->pix_fmt]) >> 3);
+        int x;
         for(y = 0; y < avctx->height && buf < buf_end; y++ ) {
             uint8_t *row = &s->frame.data[0][y * s->frame.linesize[0]];
             memcpy(row, buf, FFMIN(raw_width, buf_end - buf));
             buf += raw_width;
+            if (avctx->pix_fmt == PIX_FMT_BGR32) {
+                for(x = 0; x < avctx->width; x++)
+                    row[4 * x + 3] = row[4 * x + 3] & 0xF0 | (row[4 * x + 3] >> 4);
+            }
         }
     } else if (avctx->codec_tag == MKTAG('I','L','B','M')) { // interleaved
         if (avctx->pix_fmt == PIX_FMT_PAL8 || avctx->pix_fmt == PIX_FMT_GRAY8) {



More information about the ffmpeg-cvslog mailing list