diff options
author | Anton Khirnov <anton@khirnov.net> | 2023-04-30 22:50:40 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2023-05-08 10:38:59 +0200 |
commit | dd1c67d5393303ad23ba8cb494ddb17a2c1a002b (patch) | |
tree | 0529c20aeaaf0ca87faaea7a1056d1e352d13f44 /fftools/ffmpeg.c | |
parent | c26a6c5a523032873dc8bc7fe467b15fdcaa93ea (diff) | |
download | ffmpeg-dd1c67d5393303ad23ba8cb494ddb17a2c1a002b.tar.gz |
fftools/ffmpeg: move unconfigured graph handling to ffmpeg_filter
This code more properly belongs there.
Diffstat (limited to 'fftools/ffmpeg.c')
-rw-r--r-- | fftools/ffmpeg.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 929470f3f3..1077806121 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2018,34 +2018,11 @@ static int transcode_step(OutputStream *ost) InputStream *ist = NULL; int ret; - if (ost->filter && !ost->filter->graph->graph) { - if (ifilter_has_all_input_formats(ost->filter->graph)) { - ret = configure_filtergraph(ost->filter->graph); - if (ret < 0) { - av_log(NULL, AV_LOG_ERROR, "Error reinitializing filters!\n"); - return ret; - } - } - } - - if (ost->filter && ost->filter->graph->graph) { + if (ost->filter) { if ((ret = fg_transcode_step(ost->filter->graph, &ist)) < 0) return ret; if (!ist) return 0; - } else if (ost->filter) { - int i; - for (i = 0; i < ost->filter->graph->nb_inputs; i++) { - InputFilter *ifilter = ost->filter->graph->inputs[i]; - if (!ifilter->ist->got_output && !input_files[ifilter->ist->file_index]->eof_reached) { - ist = ifilter->ist; - break; - } - } - if (!ist) { - ost->inputs_done = 1; - return 0; - } } else { ist = ost->ist; av_assert0(ist); |