diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 09:55:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 09:55:01 +0200 |
| commit | c378ba19b5c0915a19e1e5d0d698846c6385b46e (patch) | |
| tree | 5e92578bb3cdaec86403bb8d881100bffd9fe2e8 | |
| parent | 16e5e13c7e46a1c4ea0546fd9f4298cb8f3dfa97 (diff) | |
| download | ffmpeg-c378ba19b5c0915a19e1e5d0d698846c6385b46e.tar.gz | |
abuffer: switch to an AVOptions-based shorthand system.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/avfilter.c | 1 | ||||
| -rw-r--r-- | libavfilter/buffersrc.c | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index c6ae0cfcd9..cf0aefe3a4 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -683,7 +683,6 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, // TODO: drop me static const char *const filters_left_to_update[] = { - "abuffer", #if FF_API_ACONVERT_FILTER "aconvert", #endif diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index b8dad2391c..1d65a1db35 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -345,8 +345,8 @@ static const AVOption abuffer_options[] = { { "time_base", NULL, OFFSET(time_base), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, INT_MAX, A }, { "sample_rate", NULL, OFFSET(sample_rate), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, A }, { "sample_fmt", NULL, OFFSET(sample_fmt_str), AV_OPT_TYPE_STRING, .flags = A }, - { "channels", NULL, OFFSET(channels), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, A }, { "channel_layout", NULL, OFFSET(channel_layout_str), AV_OPT_TYPE_STRING, .flags = A }, + { "channels", NULL, OFFSET(channels), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, A }, { NULL }, }; @@ -532,9 +532,6 @@ static const AVFilterPad avfilter_asrc_abuffer_outputs[] = { { NULL } }; -static const char *const abuffer_shorthand[] = { "time_base", "sample_rate", - "sample_fmt", "channel_layout", NULL }; - AVFilter avfilter_asrc_abuffer = { .name = "abuffer", .description = NULL_IF_CONFIG_SMALL("Buffer audio frames, and make them accessible to the filterchain."), @@ -547,5 +544,4 @@ AVFilter avfilter_asrc_abuffer = { .inputs = NULL, .outputs = avfilter_asrc_abuffer_outputs, .priv_class = &abuffer_class, - .shorthand = abuffer_shorthand, }; |