Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Give less generic names to global library option arrays

Browse Source
pull/37/head
Diego Biurrun 12 years ago
parent 0d6fa3977b
commit b5a138652f
9 changed files with 14 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      doc/print_options.c
  2. 2
      libavcodec/options.c
  3. 2
      libavcodec/options_table.h
  4. 4
      libavfilter/avfilter.c
  5. 2
      libavformat/options.c
  6. 2
      libavformat/options_table.h
  7. 4
      libavresample/options.c
  8. 4
      libavutil/opt.h
  9. 4
      libswscale/options.c

4
doc/print_options.c
Unescape View File

@ -99,7 +99,7 @@ static void show_format_opts(void)
#include "libavformat/options_table.h" #include "libavformat/options_table.h"
printf("@section Format AVOptions\n"); printf("@section Format AVOptions\n");
show_opts(options, 0); show_opts(avformat_options, 0);
} }
static void show_codec_opts(void) static void show_codec_opts(void)
@ -107,7 +107,7 @@ static void show_codec_opts(void)
#include "libavcodec/options_table.h" #include "libavcodec/options_table.h"
printf("@section Codec AVOptions\n"); printf("@section Codec AVOptions\n");
show_opts(options, 1); show_opts(avcodec_options, 1);
} }
int main(int argc, char **argv) int main(int argc, char **argv)

2
libavcodec/options.c
Unescape View File

@ -70,7 +70,7 @@ static const AVClass *codec_child_class_next(const AVClass *prev)
static const AVClass av_codec_context_class = { static const AVClass av_codec_context_class = {
.class_name = "AVCodecContext", .class_name = "AVCodecContext",
.item_name = context_to_name, .item_name = context_to_name,
.option = options, .option = avcodec_options,
.version = LIBAVUTIL_VERSION_INT, .version = LIBAVUTIL_VERSION_INT,
.log_level_offset_offset = offsetof(AVCodecContext, log_level_offset), .log_level_offset_offset = offsetof(AVCodecContext, log_level_offset),
.child_next = codec_child_next, .child_next = codec_child_next,

2
libavcodec/options_table.h
Unescape View File

@ -39,7 +39,7 @@
#define AV_CODEC_DEFAULT_BITRATE 200*1000 #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}, {"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 " {"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 " "ratecontrol is willing to deviate from the target average bitrate value. This is not related "

4
libavfilter/avfilter.c
Unescape View File

@ -354,7 +354,7 @@ static const AVClass *filter_child_class_next(const AVClass *prev)
#define OFFSET(x) offsetof(AVFilterContext, x) #define OFFSET(x) offsetof(AVFilterContext, x)
#define FLAGS AV_OPT_FLAG_VIDEO_PARAM #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, { "thread_type", "Allowed thread types", OFFSET(thread_type), AV_OPT_TYPE_FLAGS,
{ .i64 = AVFILTER_THREAD_SLICE }, 0, INT_MAX, FLAGS, "thread_type" }, { .i64 = AVFILTER_THREAD_SLICE }, 0, INT_MAX, FLAGS, "thread_type" },
{ "slice", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AVFILTER_THREAD_SLICE }, .unit = "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, .version = LIBAVUTIL_VERSION_INT,
.child_next = filter_child_next, .child_next = filter_child_next,
.child_class_next = filter_child_class_next, .child_class_next = filter_child_class_next,
.option = options, .option = avfilter_options,
}; };
static int default_execute(AVFilterContext *ctx, action_func *func, void *arg, static int default_execute(AVFilterContext *ctx, action_func *func, void *arg,

2
libavformat/options.c
Unescape View File

@ -79,7 +79,7 @@ static const AVClass *format_child_class_next(const AVClass *prev)
static const AVClass av_format_context_class = { static const AVClass av_format_context_class = {
.class_name = "AVFormatContext", .class_name = "AVFormatContext",
.item_name = format_to_name, .item_name = format_to_name,
.option = options, .option = avformat_options,
.version = LIBAVUTIL_VERSION_INT, .version = LIBAVUTIL_VERSION_INT,
.child_next = format_child_next, .child_next = format_child_next,
.child_class_next = format_child_class_next, .child_class_next = format_child_class_next,

2
libavformat/options_table.h
Unescape View File

@ -30,7 +30,7 @@
#define E AV_OPT_FLAG_ENCODING_PARAM #define E AV_OPT_FLAG_ENCODING_PARAM
#define D AV_OPT_FLAG_DECODING_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}, {"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}, {"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"}, {"fflags", NULL, OFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT }, INT_MIN, INT_MAX, D|E, "fflags"},

4
libavresample/options.c
Unescape View File

@ -33,7 +33,7 @@
#define OFFSET(x) offsetof(AVAudioResampleContext, x) #define OFFSET(x) offsetof(AVAudioResampleContext, x)
#define PARAM AV_OPT_FLAG_AUDIO_PARAM #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_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_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 }, { "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 = { static const AVClass av_resample_context_class = {
.class_name = "AVAudioResampleContext", .class_name = "AVAudioResampleContext",
.item_name = av_default_item_name, .item_name = av_default_item_name,
.option = options, .option = avresample_options,
.version = LIBAVUTIL_VERSION_INT, .version = LIBAVUTIL_VERSION_INT,
}; };

4
libavutil/opt.h
Unescape View File

@ -62,7 +62,7 @@
* int bin_len; * int bin_len;
* } test_struct; * } 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), * { "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 }, * 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), * { "test_str", "This is a test option of string type.", offsetof(test_struct, str_opt),
@ -75,7 +75,7 @@
* static const AVClass test_class = { * static const AVClass test_class = {
* .class_name = "test class", * .class_name = "test class",
* .item_name = av_default_item_name, * .item_name = av_default_item_name,
* .option = options, * .option = test_options,
* .version = LIBAVUTIL_VERSION_INT, * .version = LIBAVUTIL_VERSION_INT,
* }; * };
* @endcode * @endcode

4
libswscale/options.c
Unescape View File

@ -33,7 +33,7 @@ static const char *sws_context_to_name(void *ptr)
#define DEFAULT 0 #define DEFAULT 0
#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM #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" }, { "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" }, { "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" }, { "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 } { 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) const AVClass *sws_get_class(void)
{ {

Write Preview
Loading…
Cancel
Save