[FFmpeg-cvslog] Revert "Always write all colours for animated gif files, including transparent ones."

Carl Eugen Hoyos git at videolan.org
Fri Dec 21 18:19:11 CET 2012


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Fri Dec 21 18:18:39 2012 +0100| [a3a22c2178f8d85e9a135c0c5c5cb6f60aaad15d] | committer: Carl Eugen Hoyos

Revert "Always write all colours for animated gif files, including transparent ones."

It breaks some opaque samples.

This reverts commit d4fdaafdb76a927be6fea15013807641bbcc6bd9.

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

 libavcodec/gifdec.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavcodec/gifdec.c b/libavcodec/gifdec.c
index e58e19f..4f44fd4 100644
--- a/libavcodec/gifdec.c
+++ b/libavcodec/gifdec.c
@@ -241,9 +241,8 @@ static int gif_read_image(GifState *s)
         pr = ptr + width;
 
         for (px = ptr, idx = s->idx_line; px < pr; px++, idx++) {
-            *px = pal[*idx];
-            if (*idx == s->transparent_color_index)
-                *px &= 0xFFFFFF;
+            if (*idx != s->transparent_color_index)
+                *px = pal[*idx];
         }
 
         if (is_interleaved) {



More information about the ffmpeg-cvslog mailing list