aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthieu Bouron <matthieu.bouron@gmail.com>2013-04-11 00:27:31 +0200
committerMatthieu Bouron <matthieu.bouron@gmail.com>2013-04-11 00:31:25 +0200
commit6f46403cb0568440e9f0b177c6f6abb4d0898309 (patch)
tree674cd5f0228766f46b12f7d71e8ff32d220a6b65
parent2040b428b45fa4f0167acc40a49771f92cd96769 (diff)
downloadffmpeg-6f46403cb0568440e9f0b177c6f6abb4d0898309.tar.gz
lavfi/il: switch to AVOption-based system
-rw-r--r--doc/filters.texi3
-rw-r--r--libavfilter/avfilter.c1
-rw-r--r--libavfilter/vf_il.c3
3 files changed, 2 insertions, 5 deletions
diff --git a/doc/filters.texi b/doc/filters.texi
index b2d375df5a..cd81a71748 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -3750,8 +3750,7 @@ fields (so called half pictures). Odd lines are moved to the top
half of the output image, even lines to the bottom half.
You can process (filter) them independently and then re-interleave them.
-It 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 luma_mode, l
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 753567fe81..8864a6b8b8 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -678,6 +678,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
!strcmp(filter->filter->name, "geq" ) ||
!strcmp(filter->filter->name, "gradfun" ) ||
!strcmp(filter->filter->name, "hqdn3d" ) ||
+ !strcmp(filter->filter->name, "il" ) ||
!strcmp(filter->filter->name, "ocv" ) ||
!strcmp(filter->filter->name, "lut" ) ||
!strcmp(filter->filter->name, "lutyuv" ) ||
diff --git a/libavfilter/vf_il.c b/libavfilter/vf_il.c
index 7eee398ea0..904be8c1c4 100644
--- a/libavfilter/vf_il.c
+++ b/libavfilter/vf_il.c
@@ -204,8 +204,6 @@ static const AVFilterPad outputs[] = {
{ NULL }
};
-static const char *const shorthand[] = { NULL };
-
AVFilter avfilter_vf_il = {
.name = "il",
.description = NULL_IF_CONFIG_SMALL("Deinterleave or interleave fields."),
@@ -214,5 +212,4 @@ AVFilter avfilter_vf_il = {
.inputs = inputs,
.outputs = outputs,
.priv_class = &il_class,
- .shorthand = shorthand,
};