# HG changeset patch
# User alex
# Date 1161299027 0
# Node ID 1bf7bc44430f6070ac6afdebe87da25ceb9956c4
# Parent  5ccdefd60f610415377346050f1b98c37311a830
correct signaling of palette change

diff -r 5ccdefd60f61 -r 1bf7bc44430f flicvideo.c
--- a/flicvideo.c	Thu Oct 19 20:24:33 2006 +0000
+++ b/flicvideo.c	Thu Oct 19 23:03:47 2006 +0000
@@ -190,7 +190,6 @@
         case FLI_256_COLOR:
         case FLI_COLOR:
             stream_ptr_after_color_chunk = stream_ptr + chunk_size - 6;
-            s->new_palette = 1;
 
             /* check special case: If this file is from the Magic Carpet
              * game and uses 6-bit colors even though it reports 256-color
@@ -216,6 +215,7 @@
                     color_changes = 256;
 
                 for (j = 0; j < color_changes; j++) {
+                    unsigned int entry;
 
                     /* wrap around, for good measure */
                     if ((unsigned)palette_ptr >= 256)
@@ -224,7 +224,10 @@
                     r = buf[stream_ptr++] << color_shift;
                     g = buf[stream_ptr++] << color_shift;
                     b = buf[stream_ptr++] << color_shift;
-                    s->palette[palette_ptr++] = (r << 16) | (g << 8) | b;
+                    entry = (r << 16) | (g << 8) | b;
+                    if (s->palette[palette_ptr] != entry)
+                        s->new_palette = 1;
+                    s->palette[palette_ptr++] = entry;
                 }
             }
 
@@ -404,9 +407,8 @@
                "and final chunk ptr = %d\n", buf_size, stream_ptr);
 
     /* make the palette available on the way out */
-//    if (s->new_palette) {
-    if (1) {
-        memcpy(s->frame.data[1], s->palette, AVPALETTE_SIZE);
+    memcpy(s->frame.data[1], s->palette, AVPALETTE_SIZE);
+    if (s->new_palette) {
         s->frame.palette_has_changed = 1;
         s->new_palette = 0;
     }