virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avconv: create the complex filtergraphs earlier

Browse Source 
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.
This commit is contained in:
Anton Khirnov
2015-07-15 17:17:54 +02:00
parent 1959351aec
commit be101bc1e3
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
avconv_opt.c
View File

@@ -1418,11 +1418,6 @@ static int open_output_file(OptionsContext *o, const char *filename)
AVDictionary *unused_opts = NULL; AVDictionary *unused_opts = NULL;
AVDictionaryEntry *e = 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); GROW_ARRAY(output_files, nb_output_files);
of = av_mallocz(sizeof(*of)); of = av_mallocz(sizeof(*of));
if (!of) if (!of)
@@ -2232,6 +2227,13 @@ int avconv_parse_options(int argc, char **argv)
goto fail; 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 */ /* open output files */
ret = open_files(&octx.groups[GROUP_OUTFILE], "output", open_output_file); ret = open_files(&octx.groups[GROUP_OUTFILE], "output", open_output_file);
if (ret < 0) { if (ret < 0) {