diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 09:16:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 09:16:36 +0200 |
| commit | a8e963835a43e64311751b01f44707bd0e360d46 (patch) | |
| tree | 3b21d37293b3765a70ae195dc61fd6984e3b69d9 /libavformat | |
| parent | 8e970a58614fe15565d5849c933f17b9ec138647 (diff) | |
| parent | b5a138652ff8a5b987d3e1191e67fd9f6575527e (diff) | |
| download | ffmpeg-a8e963835a43e64311751b01f44707bd0e360d46.tar.gz | |
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>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/options.c | 2 | ||||
| -rw-r--r-- | libavformat/options_table.h | 2 |
2 files changed, 2 insertions, 2 deletions
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}, |