diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-08-08 10:24:26 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-08-08 10:24:26 +0000 |
| commit | ed4e20ac7fb83bddf4c9a1fc65f30821dcbc7935 (patch) | |
| tree | b781b2f8b6f760de57a6de022ab31d383ddeb892 | |
| parent | a2fd60437d0c7cf21a9365024efaa764bddaf3ab (diff) | |
| download | ffmpeg-ed4e20ac7fb83bddf4c9a1fc65f30821dcbc7935.tar.gz | |
Fix some "'static' is not at beginning of declaration" warnings.
Originally committed as revision 5956 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/mpeg12data.h | 2 | ||||
| -rw-r--r-- | libavcodec/sh4/idct_sh4.c | 4 | ||||
| -rw-r--r-- | libavcodec/snow.c | 2 | ||||
| -rw-r--r-- | libavformat/amr.c | 2 | ||||
| -rw-r--r-- | libavformat/psxstr.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/mpeg12data.h b/libavcodec/mpeg12data.h index e9a10ff3a1..bfaaaa717e 100644 --- a/libavcodec/mpeg12data.h +++ b/libavcodec/mpeg12data.h @@ -367,7 +367,7 @@ const uint8_t ff_mpeg1_dc_scale_table[128]={ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, }; -const static uint8_t mpeg2_dc_scale_table1[128]={ +static const uint8_t mpeg2_dc_scale_table1[128]={ // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, diff --git a/libavcodec/sh4/idct_sh4.c b/libavcodec/sh4/idct_sh4.c index 26084a6186..062dd6d74a 100644 --- a/libavcodec/sh4/idct_sh4.c +++ b/libavcodec/sh4/idct_sh4.c @@ -27,14 +27,14 @@ #define c6 0.54119610014619712324 /* sqrt(2)*cos(6*pi/16) */ #define c7 0.27589937928294311353 /* sqrt(2)*cos(7*pi/16) */ -const static float even_table[] __attribute__ ((aligned(8))) = { +static const float even_table[] __attribute__ ((aligned(8))) = { c4, c4, c4, c4, c2, c6,-c6,-c2, c4,-c4,-c4, c4, c6,-c2, c2,-c6 }; -const static float odd_table[] __attribute__ ((aligned(8))) = { +static const float odd_table[] __attribute__ ((aligned(8))) = { c1, c3, c5, c7, c3,-c7,-c1,-c5, c5,-c1, c7, c3, diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 5bd7623ab5..98d2d4875c 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -3163,7 +3163,7 @@ static int get_4block_rd(SnowContext *s, int mb_x, int mb_y, int plane_index){ const int ref_stride= s->current_picture.linesize[plane_index]; uint8_t *dst= s->current_picture.data[plane_index]; uint8_t *src= s-> input_picture.data[plane_index]; - const static DWTELEM zero_dst[4096]; //FIXME + static const DWTELEM zero_dst[4096]; //FIXME const int b_stride = s->b_width << s->block_max_depth; const int b_height = s->b_height<< s->block_max_depth; const int w= p->width; diff --git a/libavformat/amr.c b/libavformat/amr.c index ee0ea47f1b..bac9fbe44f 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -135,7 +135,7 @@ static int amr_read_packet(AVFormatContext *s, if (enc->codec_id == CODEC_ID_AMR_NB) { - const static uint8_t packed_size[16] = {12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0}; + static const uint8_t packed_size[16] = {12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0}; uint8_t toc, q, ft; int read; int size; diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c index b4a4ac0590..8b026be250 100644 --- a/libavformat/psxstr.c +++ b/libavformat/psxstr.c @@ -80,7 +80,7 @@ typedef struct StrDemuxContext { AVPacket tmp_pkt; } StrDemuxContext; -const static char sync_header[12] = {0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00}; +static const char sync_header[12] = {0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00}; static int str_probe(AVProbeData *p) { |