diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2010-01-09 17:22:37 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2010-01-09 17:22:37 +0000 |
commit | 0366b6e1996ccd959696887498863e895392d680 (patch) | |
tree | f863a29d87200d69186a7580a842bbb191b7b413 /libavcodec | |
parent | 23b0072ad71941c0cf67398b511dfca8ef9b23d8 (diff) | |
download | ffmpeg-0366b6e1996ccd959696887498863e895392d680.tar.gz |
Make some tables static again, i mistakely thought they would be used in several
places.
Originally committed as revision 21111 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/h263data.h | 4 | ||||
-rw-r--r-- | libavcodec/mpeg4data.h | 8 | ||||
-rw-r--r-- | libavcodec/mpeg4video.h | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/libavcodec/h263data.h b/libavcodec/h263data.h index ab5d5b339d..20a9ab441a 100644 --- a/libavcodec/h263data.h +++ b/libavcodec/h263data.h @@ -127,7 +127,7 @@ const uint16_t inter_vlc[103][2] = { { 0x5e, 12 },{ 0x5f, 12 },{ 0x3, 7 }, }; -const int8_t inter_level[102] = { +static const int8_t inter_level[102] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 1, 2, 3, 4, 5, 6, 1, 2, 3, 4, 1, 2, @@ -143,7 +143,7 @@ const int8_t inter_level[102] = { 1, 1, 1, 1, 1, 1, }; -const int8_t inter_run[102] = { +static const int8_t inter_run[102] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, diff --git a/libavcodec/mpeg4data.h b/libavcodec/mpeg4data.h index cdf2159016..a809d56c4b 100644 --- a/libavcodec/mpeg4data.h +++ b/libavcodec/mpeg4data.h @@ -161,7 +161,7 @@ const uint16_t inter_rvlc[170][2]={ {0x3F7C, 15},{0x3F7D, 15},{0x0000, 4} }; -const int8_t inter_rvlc_run[169]={ +static const int8_t inter_rvlc_run[169]={ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, @@ -186,7 +186,7 @@ const int8_t inter_rvlc_run[169]={ 43, 44, }; -const int8_t inter_rvlc_level[169]={ +static const int8_t inter_rvlc_level[169]={ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 1, 2, 3, 4, 5, @@ -265,7 +265,7 @@ const uint16_t intra_rvlc[170][2]={ {0x3F7C, 15},{0x3F7D, 15},{0x0000, 4} }; -const int8_t intra_rvlc_run[169]={ +static const int8_t intra_rvlc_run[169]={ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -290,7 +290,7 @@ const int8_t intra_rvlc_run[169]={ 43, 44, }; -const int8_t intra_rvlc_level[169]={ +static const int8_t intra_rvlc_level[169]={ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h index a335fa338a..bf87626571 100644 --- a/libavcodec/mpeg4video.h +++ b/libavcodec/mpeg4video.h @@ -58,19 +58,13 @@ extern const uint8_t ff_mpeg4_DCtab_lum[13][2]; extern const uint8_t ff_mpeg4_DCtab_chrom[13][2]; extern const uint16_t ff_mpeg4_intra_vlc[103][2]; -extern const int8_t ff_mpeg4_intra_level[102]; -extern const int8_t ff_mpeg4_intra_run[102]; extern RLTable ff_mpeg4_rl_intra; /* Note this is identical to the intra rvlc except that it is reordered. */ extern const uint16_t inter_rvlc[170][2]; -extern const int8_t inter_rvlc_run[169]; -extern const int8_t inter_rvlc_level[169]; extern RLTable rvlc_rl_inter; extern const uint16_t intra_rvlc[170][2]; -extern const int8_t intra_rvlc_run[169]; -extern const int8_t intra_rvlc_level[169]; extern RLTable rvlc_rl_intra; extern const uint16_t sprite_trajectory_tab[15][2]; |