various: fix -Wold-style-declaration warning

warning: `static' is not at beginning of declaration

9 files changed, 18 insertions, 18 deletions

diff --git a/audio/filter/af_lavcac3enc.c b/audio/filter/af_lavcac3enc.c
index abf67233dc..c55e32a21b 100644
--- a/audio/filter/af_lavcac3enc.c
+++ b/audio/filter/af_lavcac3enc.c
@@ -50,7 +50,7 @@
 #define AC3_MAX_CHANNELS 6
 #define AC3_MAX_CODED_FRAME_SIZE 3840
 #define AC3_FRAME_SIZE (6  * 256)
-const static uint16_t ac3_bitrate_tab[19] = {
+static const uint16_t ac3_bitrate_tab[19] = {
     32, 40, 48, 56, 64, 80, 96, 112, 128,
     160, 192, 224, 256, 320, 384, 448, 512, 576, 640
 };
diff --git a/audio/out/ao_audiotrack.c b/audio/out/ao_audiotrack.c
index 2912430ec4..aa1b13cb29 100644
--- a/audio/out/ao_audiotrack.c
+++ b/audio/out/ao_audiotrack.c
@@ -69,7 +69,7 @@ static struct JNIByteBuffer {
     jmethodID clear;
 } ByteBuffer;
 #define OFFSET(member) offsetof(struct JNIByteBuffer, member)
-const static struct MPJniField ByteBuffer_mapping[] = {
+static const struct MPJniField ByteBuffer_mapping[] = {
     {"java/nio/ByteBuffer", NULL, MP_JNI_CLASS, OFFSET(clazz), 1},
     {"clear", "()Ljava/nio/Buffer;", MP_JNI_METHOD, OFFSET(clear), 1},
     {0},
@@ -109,7 +109,7 @@ static struct JNIAudioTrack {
     jint WRITE_NON_BLOCKING;
 } AudioTrack;
 #define OFFSET(member) offsetof(struct JNIAudioTrack, member)
-const static struct MPJniField AudioTrack_mapping[] = {
+static const struct MPJniField AudioTrack_mapping[] = {
     {"android/media/AudioTrack", NULL, MP_JNI_CLASS, OFFSET(clazz), 1},
     {"<init>", "(IIIIIII)V", MP_JNI_METHOD, OFFSET(ctor), 1},
     {"<init>", "(Landroid/media/AudioAttributes;Landroid/media/AudioFormat;III)V", MP_JNI_METHOD, OFFSET(ctorV21), 0},
@@ -151,7 +151,7 @@ static struct JNIAudioAttributes {
     jint USAGE_MEDIA;
 } AudioAttributes;
 #define OFFSET(member) offsetof(struct JNIAudioAttributes, member)
-const static struct MPJniField AudioAttributes_mapping[] = {
+static const struct MPJniField AudioAttributes_mapping[] = {
     {"android/media/AudioAttributes", NULL, MP_JNI_CLASS, OFFSET(clazz), 0},
     {"CONTENT_TYPE_MOVIE", "I", MP_JNI_STATIC_FIELD_AS_INT, OFFSET(CONTENT_TYPE_MOVIE), 0},
     {"CONTENT_TYPE_MUSIC", "I", MP_JNI_STATIC_FIELD_AS_INT, OFFSET(CONTENT_TYPE_MUSIC), 0},
@@ -168,7 +168,7 @@ static struct JNIAudioAttributesBuilder {
     jmethodID build;
 } AudioAttributesBuilder;
 #define OFFSET(member) offsetof(struct JNIAudioAttributesBuilder, member)
-const static struct MPJniField AudioAttributesBuilder_mapping[] = {
+static const struct MPJniField AudioAttributesBuilder_mapping[] = {
     {"android/media/AudioAttributes$Builder", NULL, MP_JNI_CLASS, OFFSET(clazz), 0},
     {"<init>", "()V", MP_JNI_METHOD, OFFSET(ctor), 0},
     {"setUsage", "(I)Landroid/media/AudioAttributes$Builder;", MP_JNI_METHOD, OFFSET(setUsage), 0},
@@ -193,7 +193,7 @@ static struct JNIAudioFormat {
     jint CHANNEL_OUT_7POINT1_SURROUND;
 } AudioFormat;
 #define OFFSET(member) offsetof(struct JNIAudioFormat, member)
-const static struct MPJniField AudioFormat_mapping[] = {
+static const struct MPJniField AudioFormat_mapping[] = {
     {"android/media/AudioFormat", NULL, MP_JNI_CLASS, OFFSET(clazz), 1},
     {"ENCODING_PCM_8BIT", "I", MP_JNI_STATIC_FIELD_AS_INT, OFFSET(ENCODING_PCM_8BIT), 1},
     {"ENCODING_PCM_16BIT", "I", MP_JNI_STATIC_FIELD_AS_INT, OFFSET(ENCODING_PCM_16BIT), 1},
@@ -219,7 +219,7 @@ static struct JNIAudioFormatBuilder {
     jmethodID build;
 } AudioFormatBuilder;
 #define OFFSET(member) offsetof(struct JNIAudioFormatBuilder, member)
-const static struct MPJniField AudioFormatBuilder_mapping[] = {
+static const struct MPJniField AudioFormatBuilder_mapping[] = {
     {"android/media/AudioFormat$Builder", NULL, MP_JNI_CLASS, OFFSET(clazz), 0},
     {"<init>", "()V", MP_JNI_METHOD, OFFSET(ctor), 0},
     {"setEncoding", "(I)Landroid/media/AudioFormat$Builder;", MP_JNI_METHOD, OFFSET(setEncoding), 0},
@@ -236,7 +236,7 @@ static struct JNIAudioManager {
     jint STREAM_MUSIC;
 } AudioManager;
 #define OFFSET(member) offsetof(struct JNIAudioManager, member)
-const static struct MPJniField AudioManager_mapping[] = {
+static const struct MPJniField AudioManager_mapping[] = {
     {"android/media/AudioManager", NULL, MP_JNI_CLASS, OFFSET(clazz), 1},
     {"STREAM_MUSIC", "I", MP_JNI_STATIC_FIELD_AS_INT, OFFSET(STREAM_MUSIC), 1},
     {"ERROR_DEAD_OBJECT", "I", MP_JNI_STATIC_FIELD_AS_INT, OFFSET(ERROR_DEAD_OBJECT), 0},
@@ -251,7 +251,7 @@ static struct JNIAudioTimestamp {
     jfieldID nanoTime;
 } AudioTimestamp;
 #define OFFSET(member) offsetof(struct JNIAudioTimestamp, member)
-const static struct MPJniField AudioTimestamp_mapping[] = {
+static const struct MPJniField AudioTimestamp_mapping[] = {
     {"android/media/AudioTimestamp", NULL, MP_JNI_CLASS, OFFSET(clazz), 1},
     {"<init>", "()V", MP_JNI_METHOD, OFFSET(ctor), 1},
     {"framePosition", "J", MP_JNI_FIELD, OFFSET(framePosition), 1},
@@ -261,7 +261,7 @@ const static struct MPJniField AudioTimestamp_mapping[] = {
 #undef OFFSET
 
 #define ENTRY(name) { &name, name ## _mapping }
-const static struct {
+static const struct {
     void *fields;
     const struct MPJniField *mapping;
 } jclass_list[] = {
diff --git a/player/client.c b/player/client.c
index b35f20a859..5087f89885 100644
--- a/player/client.c
+++ b/player/client.c
@@ -844,7 +844,7 @@ int mp_client_send_event_dup(struct MPContext *mpctx, const char *client_name,
     return mp_client_send_event(mpctx, client_name, 0, event, event_data.data);
 }
 
-const static bool deprecated_events[] = {
+static const bool deprecated_events[] = {
     [MPV_EVENT_IDLE] = true,
     [MPV_EVENT_TICK] = true,
 };
diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c
index 215e82ce0b..96590d28f3 100644
--- a/stream/stream_dvb.c
+++ b/stream/stream_dvb.c
@@ -114,7 +114,7 @@ static fe_code_rate_t parse_fec(const char *cr)
 
 static fe_modulation_t parse_vdr_modulation(const char** modstring)
 {
-    const static struct { const char *s; fe_modulation_t v; } table[] = {
+    static const struct { const char *s; fe_modulation_t v; } table[] = {
         { "16",  QAM_16 },
         { "32",  QAM_32 },
         { "64",  QAM_64 },
diff --git a/video/out/hwdec/hwdec_aimagereader.c b/video/out/hwdec/hwdec_aimagereader.c
index c08f97b3c7..1aa92eea4a 100644
--- a/video/out/hwdec/hwdec_aimagereader.c
+++ b/video/out/hwdec/hwdec_aimagereader.c
@@ -75,7 +75,7 @@ struct priv {
     void (EGLAPIENTRY *EGLImageTargetTexture2DOES)(GLenum, GLeglImageOES);
 };
 
-const static struct { const char *symbol; int offset; } lib_functions[] = {
+static const struct { const char *symbol; int offset; } lib_functions[] = {
     { "AImageReader_newWithUsage", offsetof(struct priv_owner, AImageReader_newWithUsage) },
     { "AImageReader_getWindow", offsetof(struct priv_owner, AImageReader_getWindow) },
     { "AImageReader_setImageListener", offsetof(struct priv_owner, AImageReader_setImageListener) },
diff --git a/video/out/hwdec/hwdec_cuda.c b/video/out/hwdec/hwdec_cuda.c
index 68ad60d465..57e4fb40e3 100644
--- a/video/out/hwdec/hwdec_cuda.c
+++ b/video/out/hwdec/hwdec_cuda.c
@@ -57,7 +57,7 @@ int check_cu(const struct ra_hwdec *hw, CUresult err, const char *func)
 
 #define CHECK_CU(x) check_cu(hw, (x), #x)
 
-const static cuda_interop_init interop_inits[] = {
+static const cuda_interop_init interop_inits[] = {
 #if HAVE_GL
     cuda_gl_init,
 #endif
diff --git a/video/out/hwdec/hwdec_drmprime.c b/video/out/hwdec/hwdec_drmprime.c
index 55bd55e505..bf604056f3 100644
--- a/video/out/hwdec/hwdec_drmprime.c
+++ b/video/out/hwdec/hwdec_drmprime.c
@@ -52,7 +52,7 @@ static void uninit(struct ra_hwdec *hw)
     av_buffer_unref(&p->hwctx.av_device_ref);
 }
 
-const static dmabuf_interop_init interop_inits[] = {
+static const dmabuf_interop_init interop_inits[] = {
 #if HAVE_DMABUF_INTEROP_GL
     dmabuf_interop_gl_init,
 #endif
@@ -72,7 +72,7 @@ const static dmabuf_interop_init interop_inits[] = {
  * pixel formats by name. As rpi is an important target platform for this hwdec
  * we don't really have the luxury of ignoring these forks.
  */
-const static char *forked_pix_fmt_names[] = {
+static const char *forked_pix_fmt_names[] = {
     "rpi4_8",
     "rpi4_10",
 };
diff --git a/video/out/hwdec/hwdec_vaapi.c b/video/out/hwdec/hwdec_vaapi.c
index d1cad42b1e..34b6e52b3c 100644
--- a/video/out/hwdec/hwdec_vaapi.c
+++ b/video/out/hwdec/hwdec_vaapi.c
@@ -124,7 +124,7 @@ static void uninit(struct ra_hwdec *hw)
     va_destroy(p->ctx);
 }
 
-const static dmabuf_interop_init interop_inits[] = {
+static const dmabuf_interop_init interop_inits[] = {
 #if HAVE_DMABUF_INTEROP_GL
     dmabuf_interop_gl_init,
 #endif
diff --git a/video/out/hwdec/hwdec_vt.c b/video/out/hwdec/hwdec_vt.c
index ab41d027cf..643ff9043f 100644
--- a/video/out/hwdec/hwdec_vt.c
+++ b/video/out/hwdec/hwdec_vt.c
@@ -36,7 +36,7 @@ static void uninit(struct ra_hwdec *hw)
     av_buffer_unref(&p->hwctx.av_device_ref);
 }
 
-const static vt_interop_init interop_inits[] = {
+static const vt_interop_init interop_inits[] = {
 #if HAVE_VIDEOTOOLBOX_GL || HAVE_IOS_GL
     vt_gl_init,
 #endif