aboutsummaryrefslogtreecommitdiffstats
path: root/libavresample
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 /libavresample
parent8e970a58614fe15565d5849c933f17b9ec138647 (diff)
parentb5a138652ff8a5b987d3e1191e67fd9f6575527e (diff)
downloadffmpeg-a8e963835a43e64311751b01f44707bd0e360d46.tar.gz
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 '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,
};