diff --git a/ffmpeg.c b/ffmpeg.c index e52a7362c3..8677f26c1e 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -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); diff --git a/ffmpeg.h b/ffmpeg.h index 69edb6260a..49d65d8461 100644 --- a/ffmpeg.h +++ b/ffmpeg.h @@ -574,7 +574,7 @@ int configure_filtergraph(FilterGraph *fg); int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out); int ist_in_filtergraph(FilterGraph *fg, InputStream *ist); int filtergraph_is_simple(FilterGraph *fg); -FilterGraph *init_simple_filtergraph(InputStream *ist, OutputStream *ost); +int init_simple_filtergraph(InputStream *ist, OutputStream *ost); int init_complex_filtergraph(FilterGraph *fg); int ffmpeg_parse_options(int argc, char **argv); diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index 0f8319f62b..76030cf995 100644 --- a/ffmpeg_filter.c +++ b/ffmpeg_filter.c @@ -193,7 +193,7 @@ DEF_CHOOSE_FORMAT(int, sample_rate, supported_samplerates, 0, DEF_CHOOSE_FORMAT(uint64_t, channel_layout, channel_layouts, 0, GET_CH_LAYOUT_NAME) -FilterGraph *init_simple_filtergraph(InputStream *ist, OutputStream *ost) +int init_simple_filtergraph(InputStream *ist, OutputStream *ost) { FilterGraph *fg = av_mallocz(sizeof(*fg)); @@ -221,7 +221,7 @@ FilterGraph *init_simple_filtergraph(InputStream *ist, OutputStream *ost) GROW_ARRAY(filtergraphs, nb_filtergraphs); filtergraphs[nb_filtergraphs - 1] = fg; - return fg; + return 0; } static void init_input_filter(FilterGraph *fg, AVFilterInOut *in) diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 68bd090c57..d995b528f6 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -1923,7 +1923,7 @@ static int configure_complex_filters(void) int i, ret = 0; for (i = 0; i < nb_filtergraphs; i++) - if (!filtergraphs[i]->graph && + if (!filtergraph_is_simple(filtergraphs[i]) && (ret = configure_filtergraph(filtergraphs[i])) < 0) return ret; return 0; @@ -2290,7 +2290,7 @@ loop_end: } av_dict_free(&unused_opts); - /* set the encoding/decoding_needed flags */ + /* set the encoding/decoding_needed flags and create simple filtergraphs*/ for (i = of->ost_index; i < nb_output_streams; i++) { OutputStream *ost = output_streams[i]; @@ -2298,6 +2298,18 @@ loop_end: if (ost->encoding_needed && ost->source_index >= 0) { InputStream *ist = input_streams[ost->source_index]; ist->decoding_needed |= DECODING_FOR_OST; + + if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO || + ost->st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { + err = init_simple_filtergraph(ist, ost); + if (err < 0) { + av_log(NULL, AV_LOG_ERROR, + "Error initializing a simple filtergraph between streams " + "%d:%d->%d:%d\n", ist->file_index, ost->source_index, + nb_output_files - 1, ost->st->index); + exit_program(1); + } + } } }