Set graph swscale opts before parsing it, that way opts are available
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>
Sat, 3 Jul 2010 03:11:04 +0000 (03:11 +0000)
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>
Sat, 3 Jul 2010 03:11:04 +0000 (03:11 +0000)
when auto-adding scalers.

Originally committed as revision 24015 to svn://svn.ffmpeg.org/ffmpeg/trunk

ffmpeg.c

index e4b4b9e..a286b0b 100644 (file)
--- 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;