diff options
author | nanahi <130121847+na-na-hi@users.noreply.github.com> | 2024-03-08 02:01:57 -0500 |
---|---|---|
committer | Kacper Michajłow <kasper93@gmail.com> | 2024-03-19 08:58:18 +0100 |
commit | 82a186567e279e1d458cb39ae78595560eb19c76 (patch) | |
tree | 2fd0cec654fd5d0c1702ad7b311aab247d0c3db5 /audio | |
parent | 4f381f2137613054cc1fda42de74602249292f47 (diff) | |
download | mpv-82a186567e279e1d458cb39ae78595560eb19c76.tar.bz2 mpv-82a186567e279e1d458cb39ae78595560eb19c76.tar.xz |
various: fix -Wold-style-declaration warning
warning: `static' is not at beginning of declaration
Diffstat (limited to 'audio')
-rw-r--r-- | audio/filter/af_lavcac3enc.c | 2 | ||||
-rw-r--r-- | audio/out/ao_audiotrack.c | 18 |
2 files changed, 10 insertions, 10 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[] = { |