Browse Source

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.
tags/n2.8
Anton Khirnov 10 years ago
parent
commit
be101bc1e3
1 changed files with 7 additions and 5 deletions
  1. +7
    -5
      avconv_opt.c

+ 7
- 5
avconv_opt.c View File

@@ -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) {


Loading…
Cancel
Save