From a689a6b698b9c6c97fb64208dc1a71b1f384eb9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux@gmail.com>
Date: Thu, 11 Apr 2013 00:52:39 +0200
Subject: [PATCH] lavfi/noise: switch to an AVOptions-based system.

---
 doc/filters.texi       | 3 +--
 libavfilter/avfilter.c | 1 +
 libavfilter/vf_noise.c | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index 490bbb817b..e25a49adf1 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -4070,8 +4070,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
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 23da5292c5..5dff27adcd 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -689,6 +689,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") ||
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,
 };