diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 01:05:14 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 01:05:14 +0200 |
commit | 8ac7090c233c0677e59ee5cf7a5817e02c9ec914 (patch) | |
tree | 005246860921ea00dd9e13077483a8e03a628d12 | |
parent | 72ce979f109f7fcfcb44a0fe12ea025b89b80dfc (diff) | |
parent | 7668b6832d3c1fd5555be5f4cf6f8e9930dd9c4e (diff) | |
download | ffmpeg-8ac7090c233c0677e59ee5cf7a5817e02c9ec914.tar.gz |
Merge remote-tracking branch 'ubitux/shorthand-cleanup'
* ubitux/shorthand-cleanup:
lavfi/idet: switch to an AVOptions-based system.
lavfi/histogram: switch to an AVOptions-based system.
lavfi/stereo3d: switch to an AVOptions-based system.
lavfi/noise: switch to an AVOptions-based system.
lavfi/histeq: switch to an AVOptions-based system.
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | doc/filters.texi | 24 | ||||
-rw-r--r-- | libavfilter/avfilter.c | 5 | ||||
-rw-r--r-- | libavfilter/vf_histeq.c | 3 | ||||
-rw-r--r-- | libavfilter/vf_histogram.c | 3 | ||||
-rw-r--r-- | libavfilter/vf_idet.c | 3 | ||||
-rw-r--r-- | libavfilter/vf_noise.c | 3 | ||||
-rw-r--r-- | libavfilter/vf_stereo3d.c | 3 |
7 files changed, 18 insertions, 26 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index c3bd741a71..4a40e931d0 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -3445,12 +3445,7 @@ viewed as an "automatically adjusting contrast filter". This filter is useful only for correcting degraded or poorly captured source video. -The filter accepts parameters as a list of @var{key}=@var{value} -pairs, separated by ":". If the key of the first options is omitted, -the arguments are interpreted according to syntax -@var{strength}:@var{intensity}:@var{antibanding}. - -This filter accepts the following named options: +The filter accepts the following options: @table @option @item strength @@ -3479,7 +3474,7 @@ Compute and draw a color distribution histogram for the input video. The computed histogram is a representation of distribution of color components in an image. -The filter accepts the following named parameters: +The filter accepts the following options: @table @option @item mode @@ -3735,6 +3730,15 @@ Detect video interlacing type. This filter tries to detect if the input is interlaced or progressive, top or bottom field first. +The filter accepts the following options: + +@table @option +@item intl_thres +Set interlacing threshold. +@item prog_thres +Set progressive threshold. +@end table + @section il Deinterleave or interleave fields. @@ -4069,8 +4073,7 @@ noformat=yuv420p|yuv444p|yuv410p Add noise on video input frame. -This filter accepts a list of options in the form of @var{key}=@var{value} -pairs separated by ":". A description of the accepted options follows. +The filter accepts the following options: @table @option @item all_seed @@ -5181,8 +5184,7 @@ is set. Convert between different stereoscopic image formats. -This filter accepts the following named options, expressed as a -sequence of @var{key}=@var{value} pairs, separated by ":". +The filters accept the following options: @table @option @item in diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 490f27b817..916d661ac7 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -679,7 +679,10 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "frei0r_src") || !strcmp(filter->filter->name, "geq" ) || !strcmp(filter->filter->name, "gradfun" ) || + !strcmp(filter->filter->name, "histeq" ) || + !strcmp(filter->filter->name, "histogram" ) || !strcmp(filter->filter->name, "hqdn3d" ) || + !strcmp(filter->filter->name, "idet" ) || !strcmp(filter->filter->name, "il" ) || !strcmp(filter->filter->name, "kerndeint" ) || !strcmp(filter->filter->name, "ocv" ) || @@ -690,6 +693,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "mandelbrot" ) || !strcmp(filter->filter->name, "mptestsrc" ) || !strcmp(filter->filter->name, "negate" ) || + !strcmp(filter->filter->name, "noise" ) || !strcmp(filter->filter->name, "overlay" ) || !strcmp(filter->filter->name, "pad" ) || !strcmp(filter->filter->name, "format") || @@ -703,6 +707,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "showspectrum") || !strcmp(filter->filter->name, "silencedetect") || !strcmp(filter->filter->name, "smartblur") || + !strcmp(filter->filter->name, "stereo3d" ) || !strcmp(filter->filter->name, "subtitles") || !strcmp(filter->filter->name, "thumbnail") || !strcmp(filter->filter->name, "transpose") || diff --git a/libavfilter/vf_histeq.c b/libavfilter/vf_histeq.c index 05e1d59a66..f4d7795cbd 100644 --- a/libavfilter/vf_histeq.c +++ b/libavfilter/vf_histeq.c @@ -269,8 +269,6 @@ static const AVFilterPad histeq_outputs[] = { { NULL } }; -static const char *const shorthand[] = { "strength", "intensity", "antibanding", NULL }; - AVFilter avfilter_vf_histeq = { .name = "histeq", .description = NULL_IF_CONFIG_SMALL("Apply global color histogram equalization."), @@ -281,5 +279,4 @@ AVFilter avfilter_vf_histeq = { .inputs = histeq_inputs, .outputs = histeq_outputs, .priv_class = &histeq_class, - .shorthand = shorthand, }; diff --git a/libavfilter/vf_histogram.c b/libavfilter/vf_histogram.c index b9cba6be1a..3c348858a6 100644 --- a/libavfilter/vf_histogram.c +++ b/libavfilter/vf_histogram.c @@ -311,8 +311,6 @@ static const AVFilterPad outputs[] = { { NULL } }; -static const char *const shorthand[] = { NULL }; - AVFilter avfilter_vf_histogram = { .name = "histogram", .description = NULL_IF_CONFIG_SMALL("Compute and draw a histogram."), @@ -321,5 +319,4 @@ AVFilter avfilter_vf_histogram = { .inputs = inputs, .outputs = outputs, .priv_class = &histogram_class, - .shorthand = shorthand, }; diff --git a/libavfilter/vf_idet.c b/libavfilter/vf_idet.c index 275302f16c..bef7f3ee3d 100644 --- a/libavfilter/vf_idet.c +++ b/libavfilter/vf_idet.c @@ -304,8 +304,6 @@ static const AVFilterPad idet_outputs[] = { { NULL } }; -static const char *const shorthand[] = { "intl_thres", "prog_thres", NULL }; - AVFilter avfilter_vf_idet = { .name = "idet", .description = NULL_IF_CONFIG_SMALL("Interlace detect Filter."), @@ -317,5 +315,4 @@ AVFilter avfilter_vf_idet = { .inputs = idet_inputs, .outputs = idet_outputs, .priv_class = &idet_class, - .shorthand = shorthand, }; diff --git a/libavfilter/vf_noise.c b/libavfilter/vf_noise.c index 84205cbe1a..52e3963464 100644 --- a/libavfilter/vf_noise.c +++ b/libavfilter/vf_noise.c @@ -462,8 +462,6 @@ static const AVFilterPad noise_outputs[] = { { NULL } }; -static const char *const shorthand[] = { NULL }; - AVFilter avfilter_vf_noise = { .name = "noise", .description = NULL_IF_CONFIG_SMALL("Add noise."), @@ -474,5 +472,4 @@ AVFilter avfilter_vf_noise = { .inputs = noise_inputs, .outputs = noise_outputs, .priv_class = &noise_class, - .shorthand = shorthand, }; diff --git a/libavfilter/vf_stereo3d.c b/libavfilter/vf_stereo3d.c index 156470f0c0..c7f39e6683 100644 --- a/libavfilter/vf_stereo3d.c +++ b/libavfilter/vf_stereo3d.c @@ -440,8 +440,6 @@ static const AVFilterPad stereo3d_outputs[] = { { NULL } }; -static const char *const shorthand[] = { "in", "out", NULL }; - AVFilter avfilter_vf_stereo3d = { .name = "stereo3d", .description = NULL_IF_CONFIG_SMALL("Convert video stereoscopic 3D view."), @@ -450,5 +448,4 @@ AVFilter avfilter_vf_stereo3d = { .inputs = stereo3d_inputs, .outputs = stereo3d_outputs, .priv_class = &stereo3d_class, - .shorthand = shorthand, }; |