summaryrefslogtreecommitdiff
path: root/libavformat
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 /libavformat
parent0d6fa3977b016f1b72b0b24b8834ff9222498548 (diff)
Give less generic names to global library option arrays
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/options.c2
-rw-r--r--libavformat/options_table.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/options.c b/libavformat/options.c
index 3399dd4397..d99f04aab5 100644
--- a/libavformat/options.c
+++ b/libavformat/options.c
@@ -79,7 +79,7 @@ static const AVClass *format_child_class_next(const AVClass *prev)
static const AVClass av_format_context_class = {
.class_name = "AVFormatContext",
.item_name = format_to_name,
- .option = options,
+ .option = avformat_options,
.version = LIBAVUTIL_VERSION_INT,
.child_next = format_child_next,
.child_class_next = format_child_class_next,
diff --git a/libavformat/options_table.h b/libavformat/options_table.h
index d1e2a0ce6c..273c589d12 100644
--- a/libavformat/options_table.h
+++ b/libavformat/options_table.h
@@ -30,7 +30,7 @@
#define E AV_OPT_FLAG_ENCODING_PARAM
#define D AV_OPT_FLAG_DECODING_PARAM
-static const AVOption options[]={
+static const AVOption avformat_options[] = {
{"probesize", "set probing size", OFFSET(probesize), AV_OPT_TYPE_INT, {.i64 = 5000000 }, 32, INT_MAX, D},
{"packetsize", "set packet size", OFFSET(packet_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, E},
{"fflags", NULL, OFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT }, INT_MIN, INT_MAX, D|E, "fflags"},