From be101bc1e357c50fcb740bc4870b3bacc93a5727 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 15 Jul 2015 17:17:54 +0200 Subject: 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. --- avconv_opt.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'avconv_opt.c') diff --git a/avconv_opt.c b/avconv_opt.c index 1ec165db01..4505a8e6a9 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) { -- cgit v1.2.3