aboutsummaryrefslogtreecommitdiffstats
path: root/libavresample
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 /libavresample
parent0d6fa3977b016f1b72b0b24b8834ff9222498548 (diff)
downloadffmpeg-b5a138652ff8a5b987d3e1191e67fd9f6575527e.tar.gz
Give less generic names to global library option arrays
Diffstat (limited to 'libavresample')
-rw-r--r--libavresample/options.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavresample/options.c b/libavresample/options.c
index 39c415b8b8..7859ec6675 100644
--- a/libavresample/options.c
+++ b/libavresample/options.c
@@ -33,7 +33,7 @@
#define OFFSET(x) offsetof(AVAudioResampleContext, x)
#define PARAM AV_OPT_FLAG_AUDIO_PARAM
-static const AVOption options[] = {
+static const AVOption avresample_options[] = {
{ "in_channel_layout", "Input Channel Layout", OFFSET(in_channel_layout), AV_OPT_TYPE_INT64, { .i64 = 0 }, INT64_MIN, INT64_MAX, PARAM },
{ "in_sample_fmt", "Input Sample Format", OFFSET(in_sample_fmt), AV_OPT_TYPE_INT, { .i64 = AV_SAMPLE_FMT_S16 }, AV_SAMPLE_FMT_U8, AV_SAMPLE_FMT_NB-1, PARAM },
{ "in_sample_rate", "Input Sample Rate", OFFSET(in_sample_rate), AV_OPT_TYPE_INT, { .i64 = 48000 }, 1, INT_MAX, PARAM },
@@ -87,7 +87,7 @@ static const AVOption options[] = {
static const AVClass av_resample_context_class = {
.class_name = "AVAudioResampleContext",
.item_name = av_default_item_name,
- .option = options,
+ .option = avresample_options,
.version = LIBAVUTIL_VERSION_INT,
};