diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2013-04-11 14:48:19 +0200 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2013-04-11 14:48:19 +0200 |
| commit | ab4afcb85b3ac23da3bce7fd9bc70d11b8bb28a4 (patch) | |
| tree | 9219d482f09609c31128e3b0da41a3c6e6f6a277 | |
| parent | 7eb1ea2ae672da791d637be0e3aad44db7df16d3 (diff) | |
| download | ffmpeg-ab4afcb85b3ac23da3bce7fd9bc70d11b8bb28a4.tar.gz | |
lavfi/blackdetect: switch to an AVOptions-based system.
| -rw-r--r-- | doc/filters.texi | 4 | ||||
| -rw-r--r-- | libavfilter/avfilter.c | 1 | ||||
| -rw-r--r-- | libavfilter/vf_blackdetect.c | 15 |
3 files changed, 1 insertions, 19 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index 6356e74939..75dd2decdd 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -1865,9 +1865,7 @@ duration of the detected black interval expressed in seconds. In order to display the output lines, you need to set the loglevel at least to the AV_LOG_INFO value. -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 black_min_duration, d diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 5604ba53b0..3c37dee506 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -682,7 +682,6 @@ static const char *const filters_left_to_update[] = { "astreamsync", "atempo", "bbox", - "blackdetect", "buffer", "flite", "hue", diff --git a/libavfilter/vf_blackdetect.c b/libavfilter/vf_blackdetect.c index e8af624c4c..9c9e6b4993 100644 --- a/libavfilter/vf_blackdetect.c +++ b/libavfilter/vf_blackdetect.c @@ -82,20 +82,6 @@ static int query_formats(AVFilterContext *ctx) return 0; } -static av_cold int init(AVFilterContext *ctx, const char *args) -{ - int ret; - BlackDetectContext *blackdetect = ctx->priv; - - blackdetect->class = &blackdetect_class; - av_opt_set_defaults(blackdetect); - - if ((ret = av_set_options_string(blackdetect, args, "=", ":")) < 0) - return ret; - - return 0; -} - static int config_input(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; @@ -211,7 +197,6 @@ AVFilter avfilter_vf_blackdetect = { .name = "blackdetect", .description = NULL_IF_CONFIG_SMALL("Detect video intervals that are (almost) black."), .priv_size = sizeof(BlackDetectContext), - .init = init, .query_formats = query_formats, .inputs = blackdetect_inputs, .outputs = blackdetect_outputs, |