diff options
| author | Matthieu Bouron <matthieu.bouron@gmail.com> | 2013-04-11 01:06:16 +0200 |
|---|---|---|
| committer | Matthieu Bouron <matthieu.bouron@gmail.com> | 2013-04-11 01:25:02 +0200 |
| commit | 6afed2aec129f42027d2ec3167c34f7b9d4e1fd6 (patch) | |
| tree | 994b5cb50561f201a8c9d28c9145811b484da96b | |
| parent | ab6091f8e21df7280f2b50fd6226bbc130fb060a (diff) | |
| download | ffmpeg-6afed2aec129f42027d2ec3167c34f7b9d4e1fd6.tar.gz | |
lavfi/blend: switch to AVOption-based system
| -rw-r--r-- | doc/filters.texi | 3 | ||||
| -rw-r--r-- | libavfilter/avfilter.c | 1 | ||||
| -rw-r--r-- | libavfilter/vf_blend.c | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index 5f85ac006a..a85b0f887f 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -1904,8 +1904,7 @@ It takes two input streams and outputs one stream, the first input is the "top" layer and second input is "bottom" layer. Output terminates when shortest input terminates. -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. +A description of the accepted options follows. @table @option @item c0_mode diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 8fe2389c80..dd4addfb6f 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -659,6 +659,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "aformat") || !strcmp(filter->filter->name, "ass") || !strcmp(filter->filter->name, "blackframe") || + !strcmp(filter->filter->name, "blend" ) || !strcmp(filter->filter->name, "boxblur" ) || !strcmp(filter->filter->name, "cellauto") || !strcmp(filter->filter->name, "colormatrix") || diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index 434b470561..d279e3a836 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -453,8 +453,6 @@ static const AVFilterPad blend_outputs[] = { { NULL } }; -static const char *const shorthand[] = { NULL }; - AVFilter avfilter_vf_blend = { .name = "blend", .description = NULL_IF_CONFIG_SMALL("Blend two video frames into each other."), @@ -465,5 +463,4 @@ AVFilter avfilter_vf_blend = { .inputs = blend_inputs, .outputs = blend_outputs, .priv_class = &blend_class, - .shorthand = shorthand, }; |