From b5a138652ff8a5b987d3e1191e67fd9f6575527e Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 1 Aug 2013 14:35:01 +0200 Subject: [PATCH] Give less generic names to global library option arrays --- doc/print_options.c | 4 ++-- libavcodec/options.c | 2 +- libavcodec/options_table.h | 2 +- libavfilter/avfilter.c | 4 ++-- libavformat/options.c | 2 +- libavformat/options_table.h | 2 +- libavresample/options.c | 4 ++-- libavutil/opt.h | 4 ++-- libswscale/options.c | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/doc/print_options.c b/doc/print_options.c index 498a808946..845b3b9c8e 100644 --- a/doc/print_options.c +++ b/doc/print_options.c @@ -99,7 +99,7 @@ static void show_format_opts(void) #include "libavformat/options_table.h" printf("@section Format AVOptions\n"); - show_opts(options, 0); + show_opts(avformat_options, 0); } static void show_codec_opts(void) @@ -107,7 +107,7 @@ static void show_codec_opts(void) #include "libavcodec/options_table.h" printf("@section Codec AVOptions\n"); - show_opts(options, 1); + show_opts(avcodec_options, 1); } int main(int argc, char **argv) diff --git a/libavcodec/options.c b/libavcodec/options.c index d140552711..8d36c01183 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -70,7 +70,7 @@ static const AVClass *codec_child_class_next(const AVClass *prev) static const AVClass av_codec_context_class = { .class_name = "AVCodecContext", .item_name = context_to_name, - .option = options, + .option = avcodec_options, .version = LIBAVUTIL_VERSION_INT, .log_level_offset_offset = offsetof(AVCodecContext, log_level_offset), .child_next = codec_child_next, diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 244d3b985e..5e9d484b28 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -39,7 +39,7 @@ #define AV_CODEC_DEFAULT_BITRATE 200*1000 -static const AVOption options[]={ +static const AVOption avcodec_options[] = { {"b", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT, {.i64 = AV_CODEC_DEFAULT_BITRATE }, INT_MIN, INT_MAX, V|A|E}, {"bt", "Set video bitrate tolerance (in bits/s). In 1-pass mode, bitrate tolerance specifies how far " "ratecontrol is willing to deviate from the target average bitrate value. This is not related " diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index fd01f19de4..89ca03587e 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -354,7 +354,7 @@ static const AVClass *filter_child_class_next(const AVClass *prev) #define OFFSET(x) offsetof(AVFilterContext, x) #define FLAGS AV_OPT_FLAG_VIDEO_PARAM -static const AVOption options[] = { +static const AVOption avfilter_options[] = { { "thread_type", "Allowed thread types", OFFSET(thread_type), AV_OPT_TYPE_FLAGS, { .i64 = AVFILTER_THREAD_SLICE }, 0, INT_MAX, FLAGS, "thread_type" }, { "slice", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AVFILTER_THREAD_SLICE }, .unit = "thread_type" }, @@ -367,7 +367,7 @@ static const AVClass avfilter_class = { .version = LIBAVUTIL_VERSION_INT, .child_next = filter_child_next, .child_class_next = filter_child_class_next, - .option = options, + .option = avfilter_options, }; static int default_execute(AVFilterContext *ctx, action_func *func, void *arg, diff --git a/libavformat/options.c b/libavformat/options.c index 3399dd4397..d99f04aab5 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -79,7 +79,7 @@ static const AVClass *format_child_class_next(const AVClass *prev) static const AVClass av_format_context_class = { .class_name = "AVFormatContext", .item_name = format_to_name, - .option = options, + .option = avformat_options, .version = LIBAVUTIL_VERSION_INT, .child_next = format_child_next, .child_class_next = format_child_class_next, diff --git a/libavformat/options_table.h b/libavformat/options_table.h index d1e2a0ce6c..273c589d12 100644 --- a/libavformat/options_table.h +++ b/libavformat/options_table.h @@ -30,7 +30,7 @@ #define E AV_OPT_FLAG_ENCODING_PARAM #define D AV_OPT_FLAG_DECODING_PARAM -static const AVOption options[]={ +static const AVOption avformat_options[] = { {"probesize", "set probing size", OFFSET(probesize), AV_OPT_TYPE_INT, {.i64 = 5000000 }, 32, INT_MAX, D}, {"packetsize", "set packet size", OFFSET(packet_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, E}, {"fflags", NULL, OFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT }, INT_MIN, INT_MAX, D|E, "fflags"}, diff --git a/libavresample/options.c b/libavresample/options.c index 39c415b8b8..7859ec6675 100644 --- a/libavresample/options.c +++ b/libavresample/options.c @@ -33,7 +33,7 @@ #define OFFSET(x) offsetof(AVAudioResampleContext, x) #define PARAM AV_OPT_FLAG_AUDIO_PARAM -static const AVOption options[] = { +static const AVOption avresample_options[] = { { "in_channel_layout", "Input Channel Layout", OFFSET(in_channel_layout), AV_OPT_TYPE_INT64, { .i64 = 0 }, INT64_MIN, INT64_MAX, PARAM }, { "in_sample_fmt", "Input Sample Format", OFFSET(in_sample_fmt), AV_OPT_TYPE_INT, { .i64 = AV_SAMPLE_FMT_S16 }, AV_SAMPLE_FMT_U8, AV_SAMPLE_FMT_NB-1, PARAM }, { "in_sample_rate", "Input Sample Rate", OFFSET(in_sample_rate), AV_OPT_TYPE_INT, { .i64 = 48000 }, 1, INT_MAX, PARAM }, @@ -87,7 +87,7 @@ static const AVOption options[] = { static const AVClass av_resample_context_class = { .class_name = "AVAudioResampleContext", .item_name = av_default_item_name, - .option = options, + .option = avresample_options, .version = LIBAVUTIL_VERSION_INT, }; diff --git a/libavutil/opt.h b/libavutil/opt.h index 2d3cc731ee..0181379b78 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -62,7 +62,7 @@ * int bin_len; * } test_struct; * - * static const AVOption options[] = { + * static const AVOption test_options[] = { * { "test_int", "This is a test option of int type.", offsetof(test_struct, int_opt), * AV_OPT_TYPE_INT, { .i64 = -1 }, INT_MIN, INT_MAX }, * { "test_str", "This is a test option of string type.", offsetof(test_struct, str_opt), @@ -75,7 +75,7 @@ * static const AVClass test_class = { * .class_name = "test class", * .item_name = av_default_item_name, - * .option = options, + * .option = test_options, * .version = LIBAVUTIL_VERSION_INT, * }; * @endcode diff --git a/libswscale/options.c b/libswscale/options.c index daf013c741..e7765d6ba9 100644 --- a/libswscale/options.c +++ b/libswscale/options.c @@ -33,7 +33,7 @@ static const char *sws_context_to_name(void *ptr) #define DEFAULT 0 #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM -static const AVOption options[] = { +static const AVOption swscale_options[] = { { "sws_flags", "scaler flags", OFFSET(flags), AV_OPT_TYPE_FLAGS, { .i64 = DEFAULT }, 0, UINT_MAX, VE, "sws_flags" }, { "fast_bilinear", "fast bilinear", 0, AV_OPT_TYPE_CONST, { .i64 = SWS_FAST_BILINEAR }, INT_MIN, INT_MAX, VE, "sws_flags" }, { "bilinear", "bilinear", 0, AV_OPT_TYPE_CONST, { .i64 = SWS_BILINEAR }, INT_MIN, INT_MAX, VE, "sws_flags" }, @@ -66,7 +66,7 @@ static const AVOption options[] = { { NULL } }; -const AVClass sws_context_class = { "SWScaler", sws_context_to_name, options }; +const AVClass sws_context_class = { "SWScaler", sws_context_to_name, swscale_options }; const AVClass *sws_get_class(void) {