Add '#undef rand' to fix test program build.

[ffmpeg] / libavformat / qtpalette.h

diff --git a/libavformat/qtpalette.h b/libavformat/qtpalette.h
index ef4ccfa91e6637ec9cc9d7150296d95425cab012..52c19079e8b3b2f7af65e3f5f550cbaa8654ecd1 100644 (file)
--- a/libavformat/qtpalette.h
+++ b/libavformat/qtpalette.h
@@ -2,19 +2,37 @@
  * Default Palettes for Quicktime Files
  *  Automatically generated from a utility derived from XAnim:
  *  http://xanim.va.pubnix.com/home.html
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef QTPALETTE_H
-#define QTPALETTE_H
+#ifndef AVFORMAT_QTPALETTE_H
+#define AVFORMAT_QTPALETTE_H
 
-unsigned char ff_qt_default_palette_4[4 * 4] = {
+#include <inttypes.h>
+
+static const uint8_t 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 ff_qt_default_palette_16[16 * 4] = {
+static const uint8_t ff_qt_default_palette_16[16 * 4] = {
   0xFF, 0xFB, 0xFF, 0x00,
   0xEF, 0xD9, 0xBB, 0x00,
   0xE8, 0xC9, 0xB1, 0x00,
@@ -33,7 +51,7 @@ unsigned char ff_qt_default_palette_16[16 * 4] = {
   0x00, 0x00, 0x00, 0x00
 };
 
-unsigned char ff_qt_default_palette_256[256 * 4] = {
+static const uint8_t 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,
@@ -292,4 +310,4 @@ unsigned char ff_qt_default_palette_256[256 * 4] = {
   /* 255, 0xFF */  0x00, 0x00, 0x00, 0x00
 };
 
-#endif
+#endif /* AVFORMAT_QTPALETTE_H */