From b5a138652ff8a5b987d3e1191e67fd9f6575527e Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Thu, 1 Aug 2013 14:35:01 +0200
Subject: Give less generic names to global library option arrays

---
 libavcodec/options.c       | 2 +-
 libavcodec/options_table.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'libavcodec')

diff --git a/libavcodec/options.c b/libavcodec/options.c
index d140552..8d36c01 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 244d3b9..5e9d484 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 "
-- 
cgit v1.1