From 2ffee3ec14e74a5472526e58bd9f74c59cd0ef2a Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefasab@gmail.com>
Date: Thu, 11 Apr 2013 00:02:27 +0200
Subject: [PATCH] lavfi/smartblur: switch to AVOption-based system

---
 doc/filters.texi           | 32 ++++++++++++++++++++------------
 libavfilter/avfilter.c     |  1 +
 libavfilter/vf_smartblur.c |  1 -
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index 1c0d82d22a..f7fa5f1e64 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -5156,32 +5156,40 @@ expressed in the form "[@var{c0} @var{c1} @var{c2} @var{c3}]"
 
 Blur the input video without impacting the outlines.
 
-This 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 the syntax:
-@var{luma_radius}:@var{luma_strength}:@var{luma_threshold}[:@var{chroma_radius}:@var{chroma_strength}:@var{chroma_threshold}]
-
 A description of the accepted options follows.
 
 @table @option
 @item luma_radius, lr
-@item chroma_radius, cr
-Set the luma/chroma radius. The option value must be a float number in
+Set the luma radius. The option value must be a float number in
 the range [0.1,5.0] that specifies the variance of the gaussian filter
 used to blur the image (slower if larger). Default value is 1.0.
 
 @item luma_strength, ls
-@item chroma_strength, cs
-Set the luma/chroma strength. The option value must be a float number
+Set the luma strength. The option value must be a float number
 in the range [-1.0,1.0] that configures the blurring. A value included
 in [0.0,1.0] will blur the image whereas a value included in
 [-1.0,0.0] will sharpen the image. Default value is 1.0.
 
 @item luma_threshold, lt
+Set the luma threshold used as a coefficient to determine
+whether a pixel should be blurred or not. The option value must be an
+integer in the range [-30,30]. A value of 0 will filter all the image,
+a value included in [0,30] will filter flat areas and a value included
+in [-30,0] will filter edges. Default value is 0.
+
+@item chroma_radius, cr
+Set the chroma radius. The option value must be a float number in
+the range [0.1,5.0] that specifies the variance of the gaussian filter
+used to blur the image (slower if larger). Default value is 1.0.
+
+@item chroma_strength, cs
+Set the chroma strength. The option value must be a float number
+in the range [-1.0,1.0] that configures the blurring. A value included
+in [0.0,1.0] will blur the image whereas a value included in
+[-1.0,0.0] will sharpen the image. Default value is 1.0.
+
 @item chroma_threshold, ct
-Set the luma/chroma threshold used as a coefficient to determine
+Set the chroma threshold used as a coefficient to determine
 whether a pixel should be blurred or not. The option value must be an
 integer in the range [-30,30]. A value of 0 will filter all the image,
 a value included in [0,30] will filter flat areas and a value included
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index b301b33de2..904164fb1c 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -693,6 +693,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
         !strcmp(filter->filter->name, "setpts"       ) ||
         !strcmp(filter->filter->name, "showspectrum") ||
         !strcmp(filter->filter->name, "silencedetect") ||
+        !strcmp(filter->filter->name, "smartblur") ||
         !strcmp(filter->filter->name, "subtitles") ||
         !strcmp(filter->filter->name, "thumbnail") ||
 //         !strcmp(filter->filter->name, "scale"      ) ||
diff --git a/libavfilter/vf_smartblur.c b/libavfilter/vf_smartblur.c
index 5e532fd25b..9832e7ed16 100644
--- a/libavfilter/vf_smartblur.c
+++ b/libavfilter/vf_smartblur.c
@@ -307,5 +307,4 @@ AVFilter avfilter_vf_smartblur = {
     .inputs        = smartblur_inputs,
     .outputs       = smartblur_outputs,
     .priv_class    = &smartblur_class,
-    .shorthand     = shorthand,
 };