summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-08-01 14:35:01 +0200
committerDiego Biurrun <diego@biurrun.de>2013-08-02 19:19:02 +0200
commitb5a138652ff8a5b987d3e1191e67fd9f6575527e (patch)
tree58765a7557141d8897905e3324ee2b71c7625534 /libavcodec
parent0d6fa3977b016f1b72b0b24b8834ff9222498548 (diff)
Give less generic names to global library option arrays
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 d140552711..8d36c01183 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -70,7 +70,7 @@ static const AVClass *codec_child_class_next(const AVClass *prev)
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 244d3b985e..5e9d484b28 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -39,7 +39,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 }, INT_MIN, INT_MAX, V|A|E},
{"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 "