diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-19 14:12:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-19 14:12:11 +0200 |
| commit | c7dd2365f432cf8338596a37e04556b66889d3e2 (patch) | |
| tree | d643b2ed947ee9e8eb5e4ae8bf4f64adc918ac29 | |
| parent | 3b0534efdcde122ace74196be8c22afd9b03c017 (diff) | |
| parent | be101bc1e357c50fcb740bc4870b3bacc93a5727 (diff) | |
Merge commit 'be101bc1e357c50fcb740bc4870b3bacc93a5727'
* commit 'be101bc1e357c50fcb740bc4870b3bacc93a5727':
avconv: create the complex filtergraphs earlier
Conflicts:
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | ffmpeg_opt.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index b9a5c39e12..0398d58ebc 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -1845,10 +1845,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); - } if (o->stop_time != INT64_MAX && o->recording_time != INT64_MAX) { o->stop_time = INT64_MAX; @@ -2922,6 +2918,13 @@ int ffmpeg_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) { |