X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fqtpalette.h;h=ef4ccfa91e6637ec9cc9d7150296d95425cab012;hb=95d1236bf50742f95aa83bc093e7db2cc9fed47a;hp=18b47c6974a6279a76d3b5903e18c6772e966c6b;hpb=b595afaae72e5e48007d0d0ad2126711bb0d13dd;p=ffmpeg

diff --git a/libavformat/qtpalette.h b/libavformat/qtpalette.h
index 18b47c6974a..ef4ccfa91e6 100644
--- a/libavformat/qtpalette.h
+++ b/libavformat/qtpalette.h
@@ -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 
+  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,
@@ -30,10 +30,10 @@ unsigned char qt_default_palette_16[16 * 4] = {
   0xFF, 0xFB, 0xF9, 0x00,
   0xE8, 0xCA, 0xC5, 0x00,
   0x8A, 0x7C, 0x77, 0x00,
-  0x00, 0x00, 0x00, 0x00 
+  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,