diff mbox series

[FFmpeg-devel] lavfi/af_aformat: remove support for comma-separated lists

Message ID 20220302160438.4136064-1-george@nsup.org
State Accepted
Commit add3571a5938c591da115dcc41291188b0651b09
Headers show
Series [FFmpeg-devel] lavfi/af_aformat: remove support for comma-separated lists | expand

Checks

Context Check Description
andriy/make_aarch64_jetson success Make finished
andriy/make_fate_aarch64_jetson success Make fate finished
andriy/make_armv7_RPi4 success Make finished
andriy/make_fate_armv7_RPi4 success Make fate finished

Commit Message

Nicolas George March 2, 2022, 4:04 p.m. UTC
It has been deprecated for nine years.

Signed-off-by: Nicolas George <george@nsup.org>
---
 libavfilter/af_aformat.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)


I want to share the delimiter-seeking function with vf_format and add
support for '/'.

Comments

James Almer March 2, 2022, 4:17 p.m. UTC | #1
On 3/2/2022 1:04 PM, Nicolas George wrote:
> It has been deprecated for nine years.

We need to make sure to add FF_API_ defines when we introduce this kind 
of deprecation in the future, as it forces people to at least look at 
them at every major bump. Nine years is definitely overkill.

> 
> Signed-off-by: Nicolas George <george@nsup.org>
> ---
>   libavfilter/af_aformat.c | 11 ++---------
>   1 file changed, 2 insertions(+), 9 deletions(-)
> 
> 
> I want to share the delimiter-seeking function with vf_format and add
> support for '/'.
> 
> 
> diff --git a/libavfilter/af_aformat.c b/libavfilter/af_aformat.c
> index ed3c75311a..d2599431dc 100644
> --- a/libavfilter/af_aformat.c
> +++ b/libavfilter/af_aformat.c
> @@ -62,19 +62,12 @@ AVFILTER_DEFINE_CLASS(aformat);
>   
>   #define PARSE_FORMATS(str, type, list, add_to_list, get_fmt, none, desc)    \
>   do {                                                                        \
> -    char *next, *cur = str, sep;                                            \
> +    char *next, *cur = str;                                                 \
>       int ret;                                                                \
>                                                                               \
> -    if (str && strchr(str, ',')) {                                          \
> -        av_log(ctx, AV_LOG_WARNING, "This syntax is deprecated, use '|' to "\
> -               "separate %s.\n", desc);                                     \
> -        sep = ',';                                                          \
> -    } else                                                                  \
> -        sep = '|';                                                          \
> -                                                                            \
>       while (cur) {                                                           \
>           type fmt;                                                           \
> -        next = strchr(cur, sep);                                            \
> +        next = strchr(cur, '|');                                            \
>           if (next)                                                           \
>               *next++ = 0;                                                    \
>                                                                               \

LGTM.
Nicolas George March 2, 2022, 4:27 p.m. UTC | #2
James Almer (12022-03-02):
> We need to make sure to add FF_API_ defines when we introduce this kind of
> deprecation in the future, as it forces people to at least look at them at
> every major bump. Nine years is definitely overkill.

That makes sense. I will try to remember it when reviewing in the
future.

> LGTM.

Thanks, pushed.

Regards,
diff mbox series

Patch

diff --git a/libavfilter/af_aformat.c b/libavfilter/af_aformat.c
index ed3c75311a..d2599431dc 100644
--- a/libavfilter/af_aformat.c
+++ b/libavfilter/af_aformat.c
@@ -62,19 +62,12 @@  AVFILTER_DEFINE_CLASS(aformat);
 
 #define PARSE_FORMATS(str, type, list, add_to_list, get_fmt, none, desc)    \
 do {                                                                        \
-    char *next, *cur = str, sep;                                            \
+    char *next, *cur = str;                                                 \
     int ret;                                                                \
                                                                             \
-    if (str && strchr(str, ',')) {                                          \
-        av_log(ctx, AV_LOG_WARNING, "This syntax is deprecated, use '|' to "\
-               "separate %s.\n", desc);                                     \
-        sep = ',';                                                          \
-    } else                                                                  \
-        sep = '|';                                                          \
-                                                                            \
     while (cur) {                                                           \
         type fmt;                                                           \
-        next = strchr(cur, sep);                                            \
+        next = strchr(cur, '|');                                            \
         if (next)                                                           \
             *next++ = 0;                                                    \
                                                                             \