[FFmpeg-cvslog] r24015 - trunk/ffmpeg.c

[bcoudurier]

Author: bcoudurier
Date: Sat Jul  3 05:11:04 2010
New Revision: 24015

Log:
Set graph swscale opts before parsing it, that way opts are available
when auto-adding scalers.

Modified:
   trunk/ffmpeg.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Sat Jul  3 05:07:33 2010	(r24014)
+++ trunk/ffmpeg.c	Sat Jul  3 05:11:04 2010	(r24015)
@@ -460,6 +460,9 @@ static int configure_filters(AVInputStre
         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(AVInputStre
             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;