[FFmpeg-devel] [PATCH] lavfi/color: drop support for old syntax

[Stefano Sabatini]

---
 doc/filters.texi         |    4 ----
 libavfilter/vsrc_color.c |   22 +---------------------
 2 files changed, 1 insertions(+), 25 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index dd5b32c..e5358b6 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -3632,10 +3632,6 @@ Provide an uniformly colored input.
 This source accepts list of options in the form of
 @var{key}=@var{value} pairs separated by ":".
 
-Alternatively, it accepts a string in the form
- at var{color}:@var{size}:@var{rate}, but this syntax is
-deprecated.
-
 Follows the description of the accepted parameters.
 
 @table @option
diff --git a/libavfilter/vsrc_color.c b/libavfilter/vsrc_color.c
index 1f26a50..827a549 100644
--- a/libavfilter/vsrc_color.c
+++ b/libavfilter/vsrc_color.c
@@ -68,18 +68,12 @@ static av_cold int color_init(AVFilterContext *ctx, const char *args)
     char frame_size  [128] = "320x240";
     char frame_rate  [128] = "25";
     AVRational frame_rate_q;
-    char *colon = 0, *equal = 0;
     int ret = 0;
 
     color->class = &color_class;
+    av_opt_set_defaults(color);
 
     if (args) {
-        colon = strchr(args, ':');
-        equal = strchr(args, '=');
-    }
-
-    if (!args || (equal && (!colon || equal < colon))) {
-        av_opt_set_defaults(color);
         if ((ret = av_set_options_string(color, args, "=", ":")) < 0) {
             av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
             goto end;
@@ -93,21 +87,7 @@ static av_cold int color_init(AVFilterContext *ctx, const char *args)
             ret = AVERROR(EINVAL);
             goto end;
         }
-    } else {
-        av_log(ctx, AV_LOG_WARNING, "Flat options syntax is deprecated, use key=value pairs.\n");
-        sscanf(args, "%127[^:]:%127[^:]:%127s", color_string, frame_size, frame_rate);
-        if (av_parse_video_size(&color->w, &color->h, frame_size) < 0) {
-            av_log(ctx, AV_LOG_ERROR, "Invalid frame size: %s\n", frame_size);
-            return AVERROR(EINVAL);
-        }
-        if (av_parse_video_rate(&frame_rate_q, frame_rate) < 0) {
-            av_log(ctx, AV_LOG_ERROR, "Invalid frame rate: %s\n", frame_rate);
-            return AVERROR(EINVAL);
-        }
-        if (av_parse_color(color->color_rgba, color_string, -1, ctx) < 0)
-            return AVERROR(EINVAL);
     }
-
     color->time_base.num = frame_rate_q.den;
     color->time_base.den = frame_rate_q.num;
 
-- 
1.7.5.4