Merge remote-tracking branch 'shariman/wmall'

[ffmpeg] / libavcodec / dfa.c

diff --git a/libavcodec/dfa.c b/libavcodec/dfa.c
index f222a594596673c87b0393a44a5b9e16cd976b4c..bce6260bf3005056397c3409b3e7e241a0e4f432 100644 (file)
--- a/libavcodec/dfa.c
+++ b/libavcodec/dfa.c
@@ -339,7 +339,7 @@ static int dfa_decode_frame(AVCodecContext *avctx,
             tmp_buf = buf;
             for (i = 0; i < pal_elems; i++) {
                 s->pal[i] = bytestream_get_be24(&tmp_buf) << 2;
-                s->pal[i] |= (s->pal[i] >> 6) & 0x333;
+                s->pal[i] |= 0xFF << 24 | (s->pal[i] >> 6) & 0x30303;
             }
             s->pic.palette_has_changed = 1;
         } else if (chunk_type <= 9) {