diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 11:16:36 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 11:16:36 +0400 |
commit | a8e963835a43e64311751b01f44707bd0e360d46 (patch) | |
tree | 3b21d37293b3765a70ae195dc61fd6984e3b69d9 | |
parent | 8e970a58614fe15565d5849c933f17b9ec138647 (diff) | |
parent | b5a138652ff8a5b987d3e1191e67fd9f6575527e (diff) |
Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e'
* commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e':
Give less generic names to global library option arrays
Conflicts:
libavcodec/options_table.h
libavfilter/avfilter.c
libavformat/options_table.h
libswscale/options.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | doc/print_options.c | 4 | ||||
-rw-r--r-- | libavcodec/options.c | 2 | ||||
-rw-r--r-- | libavcodec/options_table.h | 2 | ||||
-rw-r--r-- | libavfilter/avfilter.c | 4 | ||||
-rw-r--r-- | libavformat/options.c | 2 | ||||
-rw-r--r-- | libavformat/options_table.h | 2 | ||||
-rw-r--r-- | libavresample/options.c | 4 | ||||
-rw-r--r-- | libavutil/opt.h | 4 | ||||
-rw-r--r-- | libswscale/options.c | 4 |
9 files changed, 14 insertions, 14 deletions
diff --git a/doc/print_options.c b/doc/print_options.c index c369cfdb3b..7d6c576e9d 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 fb803f3fd6..b68c300152 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -77,7 +77,7 @@ static AVClassCategory get_category(void *ptr) 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 3461a6f4f5..e9cdfc4ac4 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -40,7 +40,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 }, 0, INT_MAX, A|V|E}, {"ab", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT, {.i64 = 128*1000 }, 0, INT_MAX, A|E}, {"bt", "Set video bitrate tolerance (in bits/s). In 1-pass mode, bitrate tolerance specifies how far " diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index c3228cd855..d09a3b53d9 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -539,7 +539,7 @@ static const AVClass *filter_child_class_next(const AVClass *prev) #define OFFSET(x) offsetof(AVFilterContext, x) #define FLAGS AV_OPT_FLAG_FILTERING_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" }, @@ -554,7 +554,7 @@ static const AVClass avfilter_class = { .category = AV_CLASS_CATEGORY_FILTER, .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 42307d170f..5218e5b92a 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -86,7 +86,7 @@ static AVClassCategory get_category(void *ptr) 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 e23ec01a4e..a87868e162 100644 --- a/libavformat/options_table.h +++ b/libavformat/options_table.h @@ -32,7 +32,7 @@ #define E AV_OPT_FLAG_ENCODING_PARAM #define D AV_OPT_FLAG_DECODING_PARAM -static const AVOption options[]={ +static const AVOption avformat_options[] = { {"avioflags", NULL, OFFSET(avio_flags), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT }, INT_MIN, INT_MAX, D|E, "avioflags"}, {"direct", "reduce buffering", 0, AV_OPT_TYPE_CONST, {.i64 = AVIO_FLAG_DIRECT }, INT_MIN, INT_MAX, D|E, "avioflags"}, {"probesize", "set probing size", OFFSET(probesize), AV_OPT_TYPE_INT, {.i64 = 5000000 }, 32, INT_MAX, D}, 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 2344aa7b4d..4802f681dc 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -64,7 +64,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), @@ -77,7 +77,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 173993c01c..81d8c28b08 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" }, @@ -75,7 +75,7 @@ static const AVOption options[] = { const AVClass sws_context_class = { .class_name = "SWScaler", .item_name = sws_context_to_name, - .option = options, + .option = swscale_options, .category = AV_CLASS_CATEGORY_SWSCALER, .version = LIBAVUTIL_VERSION_INT, }; |