mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'be101bc1e357c50fcb740bc4870b3bacc93a5727'
* commit 'be101bc1e357c50fcb740bc4870b3bacc93a5727': avconv: create the complex filtergraphs earlier Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
commit
c7dd2365f4
11
ffmpeg_opt.c
11
ffmpeg_opt.c
|
@ -1845,10 +1845,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);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (o->stop_time != INT64_MAX && o->recording_time != INT64_MAX) {
|
if (o->stop_time != INT64_MAX && o->recording_time != INT64_MAX) {
|
||||||
o->stop_time = INT64_MAX;
|
o->stop_time = INT64_MAX;
|
||||||
|
@ -2922,6 +2918,13 @@ int ffmpeg_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) {
|
||||||
|
|
Loading…
Reference in New Issue