diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 09:45:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 09:53:09 +0200 |
| commit | 16e5e13c7e46a1c4ea0546fd9f4298cb8f3dfa97 (patch) | |
| tree | 5bd4467575d634b0b2144947d350b2e1946e3218 /libavfilter | |
| parent | 8f3c440a39e8de88e24260a7dea833558f44110c (diff) | |
buffersrc: switch to an AVOptions-based shorthand system.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -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 eb381d5048..c6ae0cfcd9 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -687,7 +687,6 @@ static const char *const filters_left_to_update[] = { #if FF_API_ACONVERT_FILTER "aconvert", #endif - "buffer", "pan", }; diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index 0324ed839d..b8dad2391c 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -320,8 +320,8 @@ unsigned av_buffersrc_get_nb_failed_requests(AVFilterContext *buffer_src) static const AVOption buffer_options[] = { { "width", NULL, OFFSET(w), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, V }, - { "height", NULL, OFFSET(h), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, V }, { "video_size", NULL, OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, .flags = V }, + { "height", NULL, OFFSET(h), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, V }, { "pix_fmt", NULL, OFFSET(pix_fmt), AV_OPT_TYPE_PIXEL_FMT, .flags = V }, #if FF_API_OLD_FILTER_OPTS /* those 4 are for compatibility with the old option passing system where each filter @@ -507,9 +507,6 @@ static const AVFilterPad avfilter_vsrc_buffer_outputs[] = { { NULL } }; -static const char *const buffer_shorthand[] = { "width", "height", "pix_fmt", - "time_base_num", "time_base_den", "sar_num", "sar_den", NULL }; - AVFilter avfilter_vsrc_buffer = { .name = "buffer", .description = NULL_IF_CONFIG_SMALL("Buffer video frames, and make them accessible to the filterchain."), @@ -522,7 +519,6 @@ AVFilter avfilter_vsrc_buffer = { .inputs = NULL, .outputs = avfilter_vsrc_buffer_outputs, .priv_class = &buffer_class, - .shorthand = buffer_shorthand, }; static const AVFilterPad avfilter_asrc_abuffer_outputs[] = { |