From f96363df7a1b504307ef6c234513f117036b7bff Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Sat, 3 Jul 2010 03:11:04 +0000 Subject: [PATCH] Set graph swscale opts before parsing it, that way opts are available when auto-adding scalers. Originally committed as revision 24015 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffmpeg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index e4b4b9eb95..a286b0bb11 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -460,6 +460,9 @@ static int configure_filters(AVInputStream *ist, AVOutputStream *ost) avfilter_graph_add_filter(graph, last_filter); } + snprintf(args, sizeof(args), "flags=0x%X", (int)av_get_int(sws_opts, "sws_flags", NULL)); + graph->scale_sws_opts = av_strdup(args); + if (vfilters) { AVFilterInOut *outputs = av_malloc(sizeof(AVFilterInOut)); AVFilterInOut *inputs = av_malloc(sizeof(AVFilterInOut)); @@ -482,9 +485,6 @@ static int configure_filters(AVInputStream *ist, AVOutputStream *ost) return -1; } - snprintf(args, sizeof(args), "flags=0x%X", (int)av_get_int(sws_opts, "sws_flags", NULL)); - graph->scale_sws_opts = av_strdup(args); - /* configure all the filter links */ if (avfilter_graph_check_validity(graph, NULL)) return -1;