[FFmpeg-cvslog] j2k: fix "static is not at beginning of declaration" warning

Michael Niedermayer git at videolan.org
Thu Sep 20 02:41:12 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 20 02:13:52 2012 +0200| [d1974e05d1d6d1d28049537968bd159b39d609ec] | committer: Michael Niedermayer

j2k: fix "static is not at beginning of declaration" warning

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d1974e05d1d6d1d28049537968bd159b39d609ec
---

 libavcodec/j2k.c     |    2 +-
 libavcodec/j2k_dwt.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/j2k.c b/libavcodec/j2k.c
index 5a42814..606a3d8 100644
--- a/libavcodec/j2k.c
+++ b/libavcodec/j2k.c
@@ -252,7 +252,7 @@ int ff_j2k_init_component(J2kComponent *comp, J2kCodingStyle *codsty, J2kQuantSt
             int cblkperprecw, cblkperprech;
 
             if (qntsty->quantsty != J2K_QSTY_NONE){
-                const static uint8_t lut_gain[2][4] = {{0, 0, 0, 0}, {0, 1, 1, 2}};
+                static const uint8_t lut_gain[2][4] = {{0, 0, 0, 0}, {0, 1, 1, 2}};
                 int numbps;
 
                 numbps = cbps + lut_gain[codsty->transform][bandno + reslevelno>0];
diff --git a/libavcodec/j2k_dwt.c b/libavcodec/j2k_dwt.c
index 48aa337..6f1457f 100644
--- a/libavcodec/j2k_dwt.c
+++ b/libavcodec/j2k_dwt.c
@@ -27,7 +27,7 @@
 
 #include "j2k_dwt.h"
 
-const static float scale97[] = {1.625786, 1.230174};
+static const float scale97[] = {1.625786, 1.230174};
 
 static inline void extend53(int *p, int i0, int i1)
 {



More information about the ffmpeg-cvslog mailing list