[Ffmpeg-devel] [PATCH] warning fix
Diego Biurrun
diego
Tue Aug 8 12:15:44 CEST 2006
I stumbled across a few warnings similar to this one:
amr.c: In function 'amr_read_packet':
amr.c:138: warning: 'static' is not at beginning of declaration
These are - of course - trivially fixable. OK to commit the attached
patch? It compiles and passes regression tests of course.
Diego
-------------- next part --------------
--- libavcodec/snow.c (revision 5955)
+++ libavcodec/snow.c (working copy)
@@ -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;
--- libavcodec/mpeg12data.h (revision 5955)
+++ libavcodec/mpeg12data.h (working copy)
@@ -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,
--- libavcodec/sh4/idct_sh4.c (revision 5955)
+++ libavcodec/sh4/idct_sh4.c (working copy)
@@ -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,
--- libavformat/psxstr.c (revision 5955)
+++ libavformat/psxstr.c (working copy)
@@ -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)
{
--- libavformat/amr.c (revision 5955)
+++ libavformat/amr.c (working copy)
@@ -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;
More information about the ffmpeg-devel
mailing list