[Ffmpeg-cvslog] r5956 - in trunk: libavcodec/mpeg12data.h libavcodec/sh4/idct_sh4.c libavcodec/snow.c libavformat/amr.c libavformat/psxstr.c

[diego]

Author: diego
Date: Tue Aug  8 12:24:26 2006
New Revision: 5956

Modified:
   trunk/libavcodec/mpeg12data.h
   trunk/libavcodec/sh4/idct_sh4.c
   trunk/libavcodec/snow.c
   trunk/libavformat/amr.c
   trunk/libavformat/psxstr.c

Log:
Fix some "'static' is not at beginning of declaration" warnings.


Modified: trunk/libavcodec/mpeg12data.h
==============================================================================
--- trunk/libavcodec/mpeg12data.h	(original)
+++ trunk/libavcodec/mpeg12data.h	Tue Aug  8 12:24:26 2006
@@ -367,7 +367,7 @@
     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,

Modified: trunk/libavcodec/sh4/idct_sh4.c
==============================================================================
--- trunk/libavcodec/sh4/idct_sh4.c	(original)
+++ trunk/libavcodec/sh4/idct_sh4.c	Tue Aug  8 12:24:26 2006
@@ -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,

Modified: trunk/libavcodec/snow.c
==============================================================================
--- trunk/libavcodec/snow.c	(original)
+++ trunk/libavcodec/snow.c	Tue Aug  8 12:24:26 2006
@@ -3163,7 +3163,7 @@
     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;

Modified: trunk/libavformat/amr.c
==============================================================================
--- trunk/libavformat/amr.c	(original)
+++ trunk/libavformat/amr.c	Tue Aug  8 12:24:26 2006
@@ -135,7 +135,7 @@
 
     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;

Modified: trunk/libavformat/psxstr.c
==============================================================================
--- trunk/libavformat/psxstr.c	(original)
+++ trunk/libavformat/psxstr.c	Tue Aug  8 12:24:26 2006
@@ -80,7 +80,7 @@
     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)
 {