[FFmpeg-cvslog] fftools/ffmpeg_opt: Move stuff only used by ffmpeg_mux_init to it

[Andreas Rheinhardt]

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Mon Oct 17 19:16:43 2022 +0200| [ff2c37d449f867519d31814bb62ceda7dbeeeaae] | committer: Anton Khirnov

fftools/ffmpeg_opt: Move stuff only used by ffmpeg_mux_init to it

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

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

 fftools/ffmpeg.h          | 6 ------
 fftools/ffmpeg_mux_init.c | 6 ++++++
 fftools/ffmpeg_opt.c      | 6 ------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
index 8f03d638c3..91c5cfa3ab 100644
--- a/fftools/ffmpeg.h
+++ b/fftools/ffmpeg.h
@@ -803,15 +803,9 @@ void free_input_threads(void);
     }\
 }
 
-extern const char * const opt_name_audio_channels[];
-extern const char * const opt_name_audio_ch_layouts[];
-extern const char * const opt_name_audio_sample_rate[];
 extern const char * const opt_name_codec_names[];
 extern const char * const opt_name_codec_tags[];
 extern const char * const opt_name_frame_rates[];
-extern const char * const opt_name_frame_sizes[];
-extern const char * const opt_name_frame_pix_fmts[];
-extern const char * const opt_name_sample_fmts[];
 extern const char * const opt_name_top_field_first[];
 
 #endif /* FFTOOLS_FFMPEG_H */
diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c
index 24b4631326..aa958052d1 100644
--- a/fftools/ffmpeg_mux_init.c
+++ b/fftools/ffmpeg_mux_init.c
@@ -74,6 +74,12 @@ static const char *const opt_name_presets[]                   = {"pre", "apre",
 static const char *const opt_name_qscale[]                    = {"q", "qscale", NULL};
 static const char *const opt_name_rc_overrides[]              = {"rc_override", NULL};
 static const char *const opt_name_time_bases[]                = {"time_base", NULL};
+static const char *const opt_name_audio_channels[]            = {"ac", NULL};
+static const char *const opt_name_audio_ch_layouts[]          = {"channel_layout", "ch_layout", NULL};
+static const char *const opt_name_audio_sample_rate[]         = {"ar", NULL};
+static const char *const opt_name_frame_sizes[]               = {"s", NULL};
+static const char *const opt_name_frame_pix_fmts[]            = {"pix_fmt", NULL};
+static const char *const opt_name_sample_fmts[]               = {"sample_fmt", NULL};
 
 static int check_opt_bitexact(void *ctx, const AVDictionary *opts,
                               const char *opt_name, int flag)
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
index 9771b1c43a..7fdbf08a18 100644
--- a/fftools/ffmpeg_opt.c
+++ b/fftools/ffmpeg_opt.c
@@ -53,19 +53,13 @@
 #include "libavutil/pixfmt.h"
 
 const char *const opt_name_codec_names[]                      = {"c", "codec", "acodec", "vcodec", "scodec", "dcodec", NULL};
-const char *const opt_name_audio_channels[]                   = {"ac", NULL};
-const char *const opt_name_audio_ch_layouts[]                 = {"channel_layout", "ch_layout", NULL};
-const char *const opt_name_audio_sample_rate[]                = {"ar", NULL};
 const char *const opt_name_frame_rates[]                      = {"r", NULL};
-const char *const opt_name_frame_sizes[]                      = {"s", NULL};
-const char *const opt_name_frame_pix_fmts[]                   = {"pix_fmt", NULL};
 static const char *const opt_name_ts_scale[]                  = {"itsscale", NULL};
 static const char *const opt_name_hwaccels[]                  = {"hwaccel", NULL};
 static const char *const opt_name_hwaccel_devices[]           = {"hwaccel_device", NULL};
 static const char *const opt_name_hwaccel_output_formats[]    = {"hwaccel_output_format", NULL};
 static const char *const opt_name_autorotate[]                = {"autorotate", NULL};
 const char *const opt_name_codec_tags[]                       = {"tag", "atag", "vtag", "stag", NULL};
-const char *const opt_name_sample_fmts[]                      = {"sample_fmt", NULL};
 const char *const opt_name_top_field_first[]                  = {"top", NULL};
 static const char *const opt_name_reinit_filters[]            = {"reinit_filter", NULL};
 static const char *const opt_name_fix_sub_duration[]          = {"fix_sub_duration", NULL};