[SCM] libav/experimental: Set graph swscale opts before parsing it, that way opts are available when auto-adding scalers.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit f96363df7a1b504307ef6c234513f117036b7bff
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Sat Jul 3 03:11:04 2010 +0000

    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

diff --git a/ffmpeg.c b/ffmpeg.c
index e4b4b9e..a286b0b 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;

-- 
Libav/FFmpeg packaging