summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-03 09:16:36 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-03 09:16:36 +0200
commita8e963835a43e64311751b01f44707bd0e360d46 (patch)
tree3b21d37293b3765a70ae195dc61fd6984e3b69d9 /libavcodec
parent8e970a58614fe15565d5849c933f17b9ec138647 (diff)
parentb5a138652ff8a5b987d3e1191e67fd9f6575527e (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>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/options.c2
-rw-r--r--libavcodec/options_table.h2
2 files changed, 2 insertions, 2 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,
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 "