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

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-10-17 19:16:43 +02:00 committed by Anton Khirnov
parent c5d7b6f49b
commit ff2c37d449
3 changed files with 6 additions and 12 deletions

View File

@ -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 */

View File

@ -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)

View File

@ -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};