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 /libavcodec/options.c | |
| 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 'libavcodec/options.c')
| -rw-r--r-- | libavcodec/options.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, |