aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-09-20 02:13:52 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-09-20 02:13:52 +0200
commitd1974e05d1d6d1d28049537968bd159b39d609ec (patch)
tree545083410d1812c93c8d40be75f8588d65968558
parent161c6d16823a9813941cece4f90246da6e4d4a00 (diff)
downloadffmpeg-d1974e05d1d6d1d28049537968bd159b39d609ec.tar.gz
j2k: fix "static is not at beginning of declaration" warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/j2k.c2
-rw-r--r--libavcodec/j2k_dwt.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/j2k.c b/libavcodec/j2k.c
index 5a42814c0f..606a3d8b8b 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 48aa33735e..6f1457fc22 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)
{