Merge commit 'f62bb216ac4cfbbff16108c6bac35a0282532972'

[ffmpeg] / libavcodec / gif.c

diff --git a/libavcodec/gif.c b/libavcodec/gif.c
index 6af1f4abe2292561be341e098a5284b527c75317..d9c99d52cfdd924a9bb03178d29177388ca2d74d 100644 (file)
--- a/libavcodec/gif.c
+++ b/libavcodec/gif.c
@@ -83,7 +83,7 @@ static int gif_image_write_image(AVCodecContext *avctx,
     GIFContext *s = avctx->priv_data;
     int len = 0, height = avctx->height, width = avctx->width, x, y;
     int x_start = 0, y_start = 0, trans = s->transparent_index;
-    int honor_transparency = (s->flags & GF_TRANSDIFF) && s->last_frame;
+    int honor_transparency = (s->flags & GF_TRANSDIFF) && s->last_frame && !palette;
     const uint8_t *ptr;
 
     /* Crop image */