[FFmpeg-cvslog] avconv: create the complex filtergraphs earlier

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed Jul 15 17:17:54 2015 +0200| [be101bc1e357c50fcb740bc4870b3bacc93a5727] | committer: Anton Khirnov

avconv: create the complex filtergraphs earlier

Since global options are processed before all the other options now, we
do not have to try creating the complex filtergraphs several times
anymore, it is enough to do it once after the input files are opened.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be101bc1e357c50fcb740bc4870b3bacc93a5727
---

 avconv_opt.c |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/avconv_opt.c b/avconv_opt.c
index 1ec165d..4505a8e 100644
--- a/avconv_opt.c
+++ b/avconv_opt.c
@@ -1418,11 +1418,6 @@ static int open_output_file(OptionsContext *o, const char *filename)
     AVDictionary *unused_opts = NULL;
     AVDictionaryEntry *e = NULL;
 
-    if (configure_complex_filters() < 0) {
-        av_log(NULL, AV_LOG_FATAL, "Error configuring filters.\n");
-        exit_program(1);
-    }
-
     GROW_ARRAY(output_files, nb_output_files);
     of = av_mallocz(sizeof(*of));
     if (!of)
@@ -2232,6 +2227,13 @@ int avconv_parse_options(int argc, char **argv)
         goto fail;
     }
 
+    /* create the complex filtergraphs */
+    ret = configure_complex_filters();
+    if (ret < 0) {
+        av_log(NULL, AV_LOG_FATAL, "Error configuring filters.\n");
+        goto fail;
+    }
+
     /* open output files */
     ret = open_files(&octx.groups[GROUP_OUTFILE], "output", open_output_file);
     if (ret < 0) {