diff --git a/libavformat/mov.c b/libavformat/mov.c
index ae3e5dc8bc25f4d8111acc46eb87a5607bca38d8..dc662d3a4d85b97ccd6455fb594ced5268add7c8 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -579,7 +579,7 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
     int color_index;
     int color_dec;
     int color_greyscale;
-    unsigned char *color_table;
+    const uint8_t *color_table;
     int j;
     unsigned char r, g, b;
 
diff --git a/libavformat/qtpalette.h b/libavformat/qtpalette.h
index 088abf3e576581330632624df614e40b3b402191..e1032ddd5663f789ee20f0050d83fda0e22861f7 100644
--- a/libavformat/qtpalette.h
+++ b/libavformat/qtpalette.h
@@ -23,14 +23,14 @@
 #ifndef FFMPEG_QTPALETTE_H
 #define FFMPEG_QTPALETTE_H
 
-unsigned char ff_qt_default_palette_4[4 * 4] = {
+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,
@@ -49,7 +49,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,