# HG changeset patch
# User michael
# Date 1081626138 0
# Node ID fe91c780d26a8d3f133cec87147087032da51bad
# Parent  153985f24e5b9510b0c5f9fba88a8328dbb3f919
prefix global

diff -r 153985f24e5b -r fe91c780d26a mov.c
--- a/mov.c	Sat Apr 10 15:09:46 2004 +0000
+++ b/mov.c	Sat Apr 10 19:42:18 2004 +0000
@@ -903,11 +903,11 @@
                     /* if flag bit 3 is set, use the default palette */
                     color_count = 1 << color_depth;
                     if (color_depth == 2)
-                        color_table = qt_default_palette_4;
+                        color_table = ff_qt_default_palette_4;
                     else if (color_depth == 4)
-                        color_table = qt_default_palette_16;
+                        color_table = ff_qt_default_palette_16;
                     else
-                        color_table = qt_default_palette_256;
+                        color_table = ff_qt_default_palette_256;
 
                     for (j = 0; j < color_count; j++) {
                         r = color_table[j * 4 + 0];
diff -r 153985f24e5b -r fe91c780d26a qtpalette.h
--- a/qtpalette.h	Sat Apr 10 15:09:46 2004 +0000
+++ b/qtpalette.h	Sat Apr 10 19:42:18 2004 +0000
@@ -7,14 +7,14 @@
 #ifndef QTPALETTE_H
 #define QTPALETTE_H
 
-unsigned char qt_default_palette_4[4 * 4] = {
+unsigned char ff_qt_default_palette_4[4 * 4] = {
   0x93, 0x65, 0x5E, 0x00,
   0xFF, 0xFF, 0xFF, 0x00,
   0xDF, 0xD0, 0xAB, 0x00,
   0x00, 0x00, 0x00, 0x00 
 };
 
-unsigned char qt_default_palette_16[16 * 4] = {
+unsigned char ff_qt_default_palette_16[16 * 4] = {
   0xFF, 0xFB, 0xFF, 0x00,
   0xEF, 0xD9, 0xBB, 0x00,
   0xE8, 0xC9, 0xB1, 0x00,
@@ -33,7 +33,7 @@
   0x00, 0x00, 0x00, 0x00 
 };
 
-unsigned char qt_default_palette_256[256 * 4] = {
+unsigned char ff_qt_default_palette_256[256 * 4] = {
   /*   0, 0x00 */  0xFF, 0xFF, 0xFF, 0x00,
   /*   1, 0x01 */  0xFF, 0xFF, 0xCC, 0x00,
   /*   2, 0x02 */  0xFF, 0xFF, 0x99, 0x00,