Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / yop.c

diff --git a/libavcodec/yop.c b/libavcodec/yop.c
index 597fe891ee3e06e0d1757799beb2d9eec0841a5e..e5333db2fdb243ea93966d33797c597f9c96f7db 100644 (file)
--- a/libavcodec/yop.c
+++ b/libavcodec/yop.c
@@ -221,7 +221,8 @@ static int yop_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
         palette[i + firstcolor] = (s->srcptr[0] << 18) |
                                   (s->srcptr[1] << 10) |
                                   (s->srcptr[2] << 2);
-        palette[i + firstcolor] |= 0xFF << 24;
+        palette[i + firstcolor] |= 0xFF << 24 |
+                                   (palette[i + firstcolor] >> 6) & 0x30303;
     }
 
     s->frame.palette_has_changed = 1;