aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2008-10-02 15:52:04 +0000
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2008-10-02 15:52:04 +0000
commit9b5ede5b64a81195ed922ce92c7f4e7b185be697 (patch)
tree22421f60e5e1fda0e2c6a4261e971349fb9e4f6d
parent6dbfb7de82552062bb892e9f775f83a3e7072af4 (diff)
downloadffmpeg-9b5ede5b64a81195ed922ce92c7f4e7b185be697.tar.gz
Add (additional) const to many global tables.
Originally committed as revision 15515 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/aacdectab.h2
-rw-r--r--libavcodec/aacenc.c6
-rw-r--r--libavcodec/aactab.c6
-rw-r--r--libavcodec/aactab.h4
-rw-r--r--libavcodec/ac3dec_data.c2
-rw-r--r--libavcodec/ac3dec_data.h2
-rw-r--r--libavcodec/liba52.c2
-rw-r--r--libavcodec/libfaad.c2
-rw-r--r--libavcodec/msmpeg4data.c2
-rw-r--r--libavcodec/msmpeg4data.h2
-rw-r--r--libavcodec/ratecontrol.c2
-rw-r--r--libavformat/isom.c2
-rw-r--r--libavformat/rtsp.c2
13 files changed, 18 insertions, 18 deletions
diff --git a/libavcodec/aacdectab.h b/libavcodec/aacdectab.h
index 32f1aa4765..aca205b40d 100644
--- a/libavcodec/aacdectab.h
+++ b/libavcodec/aacdectab.h
@@ -198,7 +198,7 @@ static const float tns_tmp2_map_0_4[16] = {
0.67369562, 0.52643216, 0.36124167, 0.18374951,
};
-static const float *tns_tmp2_map[4] = {
+static const float * const tns_tmp2_map[4] = {
tns_tmp2_map_0_3,
tns_tmp2_map_0_4,
tns_tmp2_map_1_3,
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c
index fff69645b3..c38932cda9 100644
--- a/libavcodec/aacenc.c
+++ b/libavcodec/aacenc.c
@@ -83,7 +83,7 @@ static const uint8_t swb_size_1024_8[] = {
32, 36, 36, 40, 44, 48, 52, 56, 60, 64, 80
};
-static const uint8_t *swb_size_1024[] = {
+static const uint8_t * const swb_size_1024[] = {
swb_size_1024_96, swb_size_1024_96, swb_size_1024_64,
swb_size_1024_48, swb_size_1024_48, swb_size_1024_32,
swb_size_1024_24, swb_size_1024_24, swb_size_1024_16,
@@ -110,7 +110,7 @@ static const uint8_t swb_size_128_8[] = {
4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, 12, 16, 20, 20
};
-static const uint8_t *swb_size_128[] = {
+static const uint8_t * const swb_size_128[] = {
/* the last entry on the following row is swb_size_128_64 but is a
duplicate of swb_size_128_96 */
swb_size_128_96, swb_size_128_96, swb_size_128_96,
@@ -132,7 +132,7 @@ static const uint8_t run_value_bits_short[16] = {
3, 3, 3, 3, 3, 3, 3, 6, 6, 6, 6, 6, 6, 6, 6, 9
};
-static const uint8_t* run_value_bits[2] = {
+static const uint8_t* const run_value_bits[2] = {
run_value_bits_long, run_value_bits_short
};
diff --git a/libavcodec/aactab.c b/libavcodec/aactab.c
index 25f8d111b6..b9f16f1dda 100644
--- a/libavcodec/aactab.c
+++ b/libavcodec/aactab.c
@@ -387,12 +387,12 @@ static const uint8_t bits11[289] = {
5,
};
-const uint16_t *ff_aac_spectral_codes[11] = {
+const uint16_t * const ff_aac_spectral_codes[11] = {
codes1, codes2, codes3, codes4, codes5, codes6, codes7, codes8,
codes9, codes10, codes11,
};
-const uint8_t *ff_aac_spectral_bits[11] = {
+const uint8_t * const ff_aac_spectral_bits[11] = {
bits1, bits2, bits3, bits4, bits5, bits6, bits7, bits8,
bits9, bits10, bits11,
};
@@ -888,7 +888,7 @@ static const float codebook_vector10[578] = {
64.0f, 64.0f,
};
-const float *ff_aac_codebook_vectors[] = {
+const float * const ff_aac_codebook_vectors[] = {
codebook_vector0, codebook_vector0, codebook_vector2,
codebook_vector2, codebook_vector4, codebook_vector4,
codebook_vector6, codebook_vector6, codebook_vector8,
diff --git a/libavcodec/aactab.h b/libavcodec/aactab.h
index 5189fcdde0..f019f7ea9b 100644
--- a/libavcodec/aactab.h
+++ b/libavcodec/aactab.h
@@ -57,8 +57,8 @@ extern const uint8_t ff_aac_num_swb_128 [];
extern const uint32_t ff_aac_scalefactor_code[121];
extern const uint8_t ff_aac_scalefactor_bits[121];
-extern const uint16_t *ff_aac_spectral_codes[11];
-extern const uint8_t *ff_aac_spectral_bits [11];
+extern const uint16_t * const ff_aac_spectral_codes[11];
+extern const uint8_t * const ff_aac_spectral_bits [11];
extern const uint16_t ff_aac_spectral_sizes[11];
extern const float *ff_aac_codebook_vectors[];
diff --git a/libavcodec/ac3dec_data.c b/libavcodec/ac3dec_data.c
index 9404175b90..a70c8fca45 100644
--- a/libavcodec/ac3dec_data.c
+++ b/libavcodec/ac3dec_data.c
@@ -1072,7 +1072,7 @@ static const int16_t vq_hebap7[512][6] = {
{ 3231, -3284, 27336, 4174, -1683, 497},
};
-const int16_t (*ff_eac3_mantissa_vq[8])[6] = {
+const int16_t (* const ff_eac3_mantissa_vq[8])[6] = {
NULL,
vq_hebap1,
vq_hebap2,
diff --git a/libavcodec/ac3dec_data.h b/libavcodec/ac3dec_data.h
index 0be680808c..486d04a40b 100644
--- a/libavcodec/ac3dec_data.h
+++ b/libavcodec/ac3dec_data.h
@@ -31,7 +31,7 @@ extern const int16_t ff_eac3_gaq_remap_1[12];
extern const int16_t ff_eac3_gaq_remap_2_4_a[9][2];
extern const int8_t ff_eac3_gaq_remap_2_4_b[9][2];
-extern const int16_t (*ff_eac3_mantissa_vq[8])[6];
+extern const int16_t (* const ff_eac3_mantissa_vq[8])[6];
extern const uint8_t ff_eac3_frm_expstr[32][6];
extern const uint8_t ff_eac3_default_cpl_band_struct[18];
diff --git a/libavcodec/liba52.c b/libavcodec/liba52.c
index ec0a252b5f..9ffedc30d0 100644
--- a/libavcodec/liba52.c
+++ b/libavcodec/liba52.c
@@ -29,7 +29,7 @@
#ifdef CONFIG_LIBA52BIN
#include <dlfcn.h>
-static const char* liba52name = "liba52.so.0";
+static const char* const liba52name = "liba52.so.0";
#endif
/**
diff --git a/libavcodec/libfaad.c b/libavcodec/libfaad.c
index ef5b79fa93..c6da20dc3d 100644
--- a/libavcodec/libfaad.c
+++ b/libavcodec/libfaad.c
@@ -42,7 +42,7 @@
#ifdef CONFIG_LIBFAADBIN
#include <dlfcn.h>
-static const char* libfaadname = "libfaad.so";
+static const char* const libfaadname = "libfaad.so";
#else
#define dlopen(a)
#define dlclose(a)
diff --git a/libavcodec/msmpeg4data.c b/libavcodec/msmpeg4data.c
index c0bb953bc5..2b6e670c3b 100644
--- a/libavcodec/msmpeg4data.c
+++ b/libavcodec/msmpeg4data.c
@@ -1979,7 +1979,7 @@ static const uint32_t table_mb_non_intra4[128][2] = {
{0x000011, 5}, {0x0001AC, 9}, {0x0000F3, 8}, {0x000439, 11},
};
-const uint32_t (*wmv2_inter_table[WMV2_INTER_CBP_TABLE_COUNT])[2]={
+const uint32_t (* const wmv2_inter_table[WMV2_INTER_CBP_TABLE_COUNT])[2]={
table_mb_non_intra2,
table_mb_non_intra3,
table_mb_non_intra4,
diff --git a/libavcodec/msmpeg4data.h b/libavcodec/msmpeg4data.h
index b9ffb27197..5dc8846d70 100644
--- a/libavcodec/msmpeg4data.h
+++ b/libavcodec/msmpeg4data.h
@@ -91,7 +91,7 @@ extern const uint32_t ff_table0_dc_chroma[120][2];
extern const uint32_t ff_table1_dc_chroma[120][2];
#define WMV2_INTER_CBP_TABLE_COUNT 4
-extern const uint32_t (*wmv2_inter_table[WMV2_INTER_CBP_TABLE_COUNT])[2];
+extern const uint32_t (* const wmv2_inter_table[WMV2_INTER_CBP_TABLE_COUNT])[2];
extern const uint8_t wmv2_scantableA[64];
extern const uint8_t wmv2_scantableB[64];
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c
index e8d1ae8899..8e248b9083 100644
--- a/libavcodec/ratecontrol.c
+++ b/libavcodec/ratecontrol.c
@@ -94,7 +94,7 @@ int ff_rate_control_init(MpegEncContext *s)
"avgTex",
NULL
};
- static double (*func1[])(void *, double)={
+ static double (* const func1[])(void *, double)={
(void *)bits2qp,
(void *)qp2bits,
NULL
diff --git a/libavformat/isom.c b/libavformat/isom.c
index 2e7154e6c2..304aa192a5 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -221,7 +221,7 @@ const AVCodecTag ff_codec_movsubtitle_tags[] = {
/* cf. QTFileFormat.pdf p253, qtff.pdf p205 */
/* http://developer.apple.com/documentation/mac/Text/Text-368.html */
/* deprecated by putting the code as 3*5bit ascii */
-static const char *mov_mdhd_language_map[] = {
+static const char * const mov_mdhd_language_map[] = {
/* 0-9 */
"eng", "fra", "ger", "ita", "dut", "sve", "spa", "dan", "por", "nor",
"heb", "jpn", "ara", "fin", "gre", "ice", "mlt", "tur", "hr "/*scr*/, "chi"/*ace?*/,
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 254931cf3d..b1fafedf01 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -293,7 +293,7 @@ typedef struct attrname_map
/* All known fmtp parmeters and the corresping RTPAttrTypeEnum */
#define ATTR_NAME_TYPE_INT 0
#define ATTR_NAME_TYPE_STR 1
-static attrname_map_t attr_names[]=
+static const attrname_map_t attr_names[]=
{
{"SizeLength", ATTR_NAME_TYPE_INT, offsetof(rtp_payload_data_t, sizelength)},
{"IndexLength", ATTR_NAME_TYPE_INT, offsetof(rtp_payload_data_t, indexlength)},