diff mbox series

[FFmpeg-devel,1/3] Revert "fftools/ffmpeg_filter: fix the flags parsing for scaler"

Message ID 20210807101507.83161-1-fulinjie@zju.edu.cn
State New
Headers show
Series [FFmpeg-devel,1/3] Revert "fftools/ffmpeg_filter: fix the flags parsing for scaler" | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Linjie Fu Aug. 7, 2021, 10:15 a.m. UTC 
From: Linjie Fu <linjie.justin.fu@gmail.com>

This reverts commit b3a0548a981db52911dd34d9de254c4fee0a8f79.

This breaks the usage of swscale options, scale_sws_opts should be passed
to auto-inserted scale-filters.

The auto-inserted scaler accepts sws_flags in filtergraph complex which
overrides the 'flags' option for vf_scale and dump it in verbose, however
simple filtergraph doesn't override. Hence we got different verbose logs
printed in vf_scale when we specify -sws_flags in cmdline. It's a matter
of log print rather than option parsing.

Signed-off-by: Linjie Fu <linjie.justin.fu@gmail.com>
---
 fftools/ffmpeg_filter.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

Comments

Michael Niedermayer Aug. 7, 2021, 7:33 p.m. UTC | #1 
On Sat, Aug 07, 2021 at 06:15:05PM +0800, Linjie Fu wrote:
> From: Linjie Fu <linjie.justin.fu@gmail.com>
> 
> This reverts commit b3a0548a981db52911dd34d9de254c4fee0a8f79.

LGTM

thx

[...]
Michael Niedermayer Aug. 27, 2021, 8:45 p.m. UTC | #2 
On Sat, Aug 07, 2021 at 09:33:27PM +0200, Michael Niedermayer wrote:
> On Sat, Aug 07, 2021 at 06:15:05PM +0800, Linjie Fu wrote:
> > From: Linjie Fu <linjie.justin.fu@gmail.com>
> > 
> > This reverts commit b3a0548a981db52911dd34d9de254c4fee0a8f79.
> 
> LGTM

please apply this unless you intend to fix it in another way

thx

[...]
Linjie Fu Aug. 30, 2021, 1:48 p.m. UTC | #3 
On Sat, Aug 28, 2021 at 4:45 AM Michael Niedermayer <michael@niedermayer.cc>
wrote:

> On Sat, Aug 07, 2021 at 09:33:27PM +0200, Michael Niedermayer wrote:
> > On Sat, Aug 07, 2021 at 06:15:05PM +0800, Linjie Fu wrote:
> > > From: Linjie Fu <linjie.justin.fu@gmail.com>
> > >
> > > This reverts commit b3a0548a981db52911dd34d9de254c4fee0a8f79.
> >
> > LGTM
>
> please apply this unless you intend to fix it in another way
>

Rebased and applied, thx.
diff mbox series

Patch

diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
index 49076f13ee..a90858655d 100644
--- a/fftools/ffmpeg_filter.c
+++ b/fftools/ffmpeg_filter.c
@@ -977,11 +977,7 @@  int configure_filtergraph(FilterGraph *fg)
         }
         if (strlen(args))
             args[strlen(args)-1] = 0;
-
-        if (!strncmp(args, "sws_flags=", 10)) {
-            // keep the 'flags=' part
-            fg->graph->scale_sws_opts = av_strdup(args+4);
-        }
+        fg->graph->scale_sws_opts = av_strdup(args);
 
         args[0] = 0;
         while ((e = av_dict_get(ost->swr_opts, "", e,