diff options
author | Timothy Gu <timothygu99@gmail.com> | 2016-08-03 20:53:03 -0700 |
---|---|---|
committer | Timothy Gu <timothygu99@gmail.com> | 2016-08-03 20:53:03 -0700 |
commit | 1b04ea1a6c237a94f81d1b8f8a42fae46fbeacab (patch) | |
tree | 1219a7d01b489d4701bd06be9459c7725a208378 /ffmpeg.c | |
parent | 9aa3023672b3336968cbdb5c4a733b6088ad564e (diff) | |
parent | 73c6ec6d659bab11ac424a4ba6ce3a56246295ee (diff) | |
download | ffmpeg-streaming-1b04ea1a6c237a94f81d1b8f8a42fae46fbeacab.zip ffmpeg-streaming-1b04ea1a6c237a94f81d1b8f8a42fae46fbeacab.tar.gz |
Merge commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee' into merge
* commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee':
avconv: create simple filtergraphs earlier
Merged-by: Timothy Gu <timothygu99@gmail.com>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -3069,11 +3069,10 @@ static int transcode_init(void) exit_program(1); #endif - if (!ost->filter && - (enc_ctx->codec_type == AVMEDIA_TYPE_VIDEO || - enc_ctx->codec_type == AVMEDIA_TYPE_AUDIO)) { - FilterGraph *fg; - fg = init_simple_filtergraph(ist, ost); + if ((enc_ctx->codec_type == AVMEDIA_TYPE_VIDEO || + enc_ctx->codec_type == AVMEDIA_TYPE_AUDIO) && + filtergraph_is_simple(ost->filter->graph)) { + FilterGraph *fg = ost->filter->graph; if (configure_filtergraph(fg)) { av_log(NULL, AV_LOG_FATAL, "Error opening filters!\n"); exit_program(1); |