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 /libavutil/opt.h | |
| 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 'libavutil/opt.h')
| -rw-r--r-- | libavutil/opt.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 |