From a90466f741245240b80f5477b63d5e4488a96d6c Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 10 Apr 2004 19:42:18 +0000
Subject: [PATCH] prefix global
Originally committed as revision 2994 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/mov.c | 6 +++---
libavformat/qtpalette.h | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 4de976ac089..b325ceb6d79 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -903,11 +903,11 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
/* 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 --git a/libavformat/qtpalette.h b/libavformat/qtpalette.h
index 18b47c6974a..d963a82addf 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
};
-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 @@ unsigned char qt_default_palette_16[16 * 4] = {
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,
--
GitLab