virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

cosmetics: 'const static' --> 'static const' to avoid warnings of the type

Browse Source 
"'static' is not at beginning of declaration" with -Wextra.

Originally committed as revision 17391 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2009-02-17 12:03:10 +00:00
parent bf6d981806
commit 1bf6e565dd
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/dv.c
View File

@ -91,24 +91,24 @@ static inline int dv_work_pool_size(const DVprofile *d)
static inline void dv_calc_mb_coordinates(const DVprofile *d, int chan, int seq, int slot, static inline void dv_calc_mb_coordinates(const DVprofile *d, int chan, int seq, int slot,
uint16_t *tbl) uint16_t *tbl)
{ {
const static uint8_t off[] = { 2, 6, 8, 0, 4 }; static const uint8_t off[] = { 2, 6, 8, 0, 4 };
const static uint8_t shuf1[] = { 36, 18, 54, 0, 72 }; static const uint8_t shuf1[] = { 36, 18, 54, 0, 72 };
const static uint8_t shuf2[] = { 24, 12, 36, 0, 48 }; static const uint8_t shuf2[] = { 24, 12, 36, 0, 48 };
const static uint8_t shuf3[] = { 18, 9, 27, 0, 36 }; static const uint8_t shuf3[] = { 18, 9, 27, 0, 36 };
const static uint8_t l_start[] = {0, 4, 9, 13, 18, 22, 27, 31, 36, 40}; static const uint8_t l_start[] = {0, 4, 9, 13, 18, 22, 27, 31, 36, 40};
const static uint8_t l_start_shuffled[] = { 9, 4, 13, 0, 18 }; static const uint8_t l_start_shuffled[] = { 9, 4, 13, 0, 18 };
const static uint8_t serpent1[] = {0, 1, 2, 2, 1, 0, static const uint8_t serpent1[] = {0, 1, 2, 2, 1, 0,
0, 1, 2, 2, 1, 0, 0, 1, 2, 2, 1, 0,
0, 1, 2, 2, 1, 0, 0, 1, 2, 2, 1, 0,
0, 1, 2, 2, 1, 0, 0, 1, 2, 2, 1, 0,
0, 1, 2}; 0, 1, 2};
const static uint8_t serpent2[] = {0, 1, 2, 3, 4, 5, 5, 4, 3, 2, 1, 0, static const uint8_t serpent2[] = {0, 1, 2, 3, 4, 5, 5, 4, 3, 2, 1, 0,
0, 1, 2, 3, 4, 5, 5, 4, 3, 2, 1, 0, 0, 1, 2, 3, 4, 5, 5, 4, 3, 2, 1, 0,
0, 1, 2, 3, 4, 5}; 0, 1, 2, 3, 4, 5};
const static uint8_t remap[][2] = {{ 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, /* dummy */ static const uint8_t remap[][2] = {{ 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, /* dummy */
{ 0, 0}, { 0, 1}, { 0, 2}, { 0, 3}, {10, 0}, { 0, 0}, { 0, 1}, { 0, 2}, { 0, 3}, {10, 0},
{10, 1}, {10, 2}, {10, 3}, {20, 0}, {20, 1}, {10, 1}, {10, 2}, {10, 3}, {20, 0}, {20, 1},
{20, 2}, {20, 3}, {30, 0}, {30, 1}, {30, 2}, {20, 2}, {20, 3}, {30, 0}, {30, 1}, {30, 2},

2
libavcodec/mimic.c
View File

@ -121,7 +121,7 @@ static av_cold int mimic_decode_init(AVCodecContext *avctx)
return 0; return 0;
} }
const static int8_t vlcdec_lookup[9][64] = { static const int8_t vlcdec_lookup[9][64] = {
{ 0, }, { 0, },
{ -1, 1, }, { -1, 1, },
{ -3, 3, -2, 2, }, { -3, 3, -2, 2, },

4
libavcodec/mpc8data.h
View File

@ -77,7 +77,7 @@ static const uint32_t mpc8_cnk[16][32] =
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 17, 153, 969, 4845, 20349, 74613, 245157, 735471, 2042975, 5311735, 13037895, 30421755, 67863915, 145422675, 300540195} {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 17, 153, 969, 4845, 20349, 74613, 245157, 735471, 2042975, 5311735, 13037895, 30421755, 67863915, 145422675, 300540195}
}; };
const static uint8_t mpc8_cnk_len[16][33] = static const uint8_t mpc8_cnk_len[16][33] =
{ {
{0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6}, {0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6},
{0, 0, 2, 3, 4, 4, 5, 5, 6, 6, 6, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0}, {0, 0, 2, 3, 4, 4, 5, 5, 6, 6, 6, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0},
@ -98,7 +98,7 @@ const static uint8_t mpc8_cnk_len[16][33] =
}; };
const static uint32_t mpc8_cnk_lost[16][33] = static const uint32_t mpc8_cnk_lost[16][33] =
{ {
{0, 0, 1, 0, 3, 2, 1, 0, 7, 6, 5, 4, 3, 2, 1, 0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 31}, {0, 0, 1, 0, 3, 2, 1, 0, 7, 6, 5, 4, 3, 2, 1, 0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 31},
{0, 0, 1, 2, 6, 1, 11, 4, 28, 19, 9, 62, 50, 37, 23, 8, 120, 103, 85, 66, 46, 25, 3, 236, 212, 187, 161, 134, 106, 77, 47, 16, 0}, {0, 0, 1, 2, 6, 1, 11, 4, 28, 19, 9, 62, 50, 37, 23, 8, 120, 103, 85, 66, 46, 25, 3, 236, 212, 187, 161, 134, 106, 77, 47, 16, 0},

2
libavformat/nutenc.c
View File

@ -109,7 +109,7 @@ static void build_elision_headers(AVFormatContext *s){
int i; int i;
//FIXME this is lame //FIXME this is lame
//FIXME write a 2pass mode to find the maximal headers //FIXME write a 2pass mode to find the maximal headers
const static uint8_t headers[][5]={ static const uint8_t headers[][5]={
{3, 0x00, 0x00, 0x01}, {3, 0x00, 0x00, 0x01},
{4, 0x00, 0x00, 0x01, 0xB6}, {4, 0x00, 0x00, 0x01, 0xB6},
{2, 0xFF, 0xFA}, //mp3+crc {2, 0xFF, 0xFA}, //mp3+crc