[SCM] libav/experimental: Make ff_qt_default_palette_* arrays "static const"
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:09:59 UTC 2013
The following commit has been merged in the experimental branch:
commit 1fe47470d17c8b1e31e9eddb975bc61768f7dc94
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date: Sun Dec 2 23:27:01 2007 +0000
Make ff_qt_default_palette_* arrays "static const"
Originally committed as revision 11139 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/mov.c b/libavformat/mov.c
index ae3e5dc..dc662d3 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 088abf3..e1032dd 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,
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list