summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2010-07-03 03:11:04 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2010-07-03 03:11:04 +0000
commitf96363df7a1b504307ef6c234513f117036b7bff (patch)
tree6a5c8b9488ecebb55ce0c8c292f304a24350269a /ffmpeg.c
parentae447836af5cc66031e48a2df13713365cd3be7c (diff)
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
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c6
1 files 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;