diff mbox series

[FFmpeg-devel,2/2] fftools/ffmpeg_opt: remove bogus warning of multiple -af and -vf usage

Message ID 20200229222222.28130-2-cus@passwd.hu
State Accepted
Headers show
Series [FFmpeg-devel,1/2] fftools/ffmpeg_opt: warn about overwritten parsed options
Related show

Checks

Context Check Description
andriy/ffmpeg-patchwork pending
andriy/ffmpeg-patchwork success Applied patch
andriy/ffmpeg-patchwork success Configure finished
andriy/ffmpeg-patchwork success Make finished
andriy/ffmpeg-patchwork success Make fate finished

Commit Message

Marton Balint Feb. 29, 2020, 10:22 p.m. UTC
This is redundant after the last patch and also fixes ticket #7712.

Signed-off-by: Marton Balint <cus@passwd.hu>
---
 fftools/ffmpeg_opt.c | 4 ----
 1 file changed, 4 deletions(-)

Comments

Paul B Mahol March 1, 2020, 9:10 a.m. UTC | #1
lgtm

On 2/29/20, Marton Balint <cus@passwd.hu> wrote:
> This is redundant after the last patch and also fixes ticket #7712.
>
> Signed-off-by: Marton Balint <cus@passwd.hu>
> ---
>  fftools/ffmpeg_opt.c | 4 ----
>  1 file changed, 4 deletions(-)
>
> diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
> index 3d6fafe073..df6928ee10 100644
> --- a/fftools/ffmpeg_opt.c
> +++ b/fftools/ffmpeg_opt.c
> @@ -1746,8 +1746,6 @@ static OutputStream *new_video_stream(OptionsContext
> *o, AVFormatContext *oc, in
>
>      MATCH_PER_STREAM_OPT(filter_scripts, str, ost->filters_script, oc, st);
>      MATCH_PER_STREAM_OPT(filters,        str, ost->filters,        oc, st);
> -    if (o->nb_filters > 1)
> -        av_log(NULL, AV_LOG_ERROR, "Only '-vf %s' read, ignoring remaining
> -vf options: Use ',' to separate filters\n", ost->filters);
>
>      if (!ost->stream_copy) {
>          const char *p = NULL;
> @@ -1929,8 +1927,6 @@ static OutputStream *new_audio_stream(OptionsContext
> *o, AVFormatContext *oc, in
>
>      MATCH_PER_STREAM_OPT(filter_scripts, str, ost->filters_script, oc, st);
>      MATCH_PER_STREAM_OPT(filters,        str, ost->filters,        oc, st);
> -    if (o->nb_filters > 1)
> -        av_log(NULL, AV_LOG_ERROR, "Only '-af %s' read, ignoring remaining
> -af options: Use ',' to separate filters\n", ost->filters);
>
>      if (!ost->stream_copy) {
>          char *sample_fmt = NULL;
> --
> 2.16.4
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff mbox series

Patch

diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
index 3d6fafe073..df6928ee10 100644
--- a/fftools/ffmpeg_opt.c
+++ b/fftools/ffmpeg_opt.c
@@ -1746,8 +1746,6 @@  static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in
 
     MATCH_PER_STREAM_OPT(filter_scripts, str, ost->filters_script, oc, st);
     MATCH_PER_STREAM_OPT(filters,        str, ost->filters,        oc, st);
-    if (o->nb_filters > 1)
-        av_log(NULL, AV_LOG_ERROR, "Only '-vf %s' read, ignoring remaining -vf options: Use ',' to separate filters\n", ost->filters);
 
     if (!ost->stream_copy) {
         const char *p = NULL;
@@ -1929,8 +1927,6 @@  static OutputStream *new_audio_stream(OptionsContext *o, AVFormatContext *oc, in
 
     MATCH_PER_STREAM_OPT(filter_scripts, str, ost->filters_script, oc, st);
     MATCH_PER_STREAM_OPT(filters,        str, ost->filters,        oc, st);
-    if (o->nb_filters > 1)
-        av_log(NULL, AV_LOG_ERROR, "Only '-af %s' read, ignoring remaining -af options: Use ',' to separate filters\n", ost->filters);
 
     if (!ost->stream_copy) {
         char *sample_fmt = NULL;