mirror of https://git.ffmpeg.org/ffmpeg.git
fftools/ffmpeg_enc: stop configuring filter inputs from encoder flush
When no frames are ever seen by an encoder, encoder flush will do a last-ditch attempt to configure its source filtergraph in order to at least get the stream parameters. This involves extracting demuxer parameters from filtergraph source inputs, which is * a bad layering violation * probably unreachable, because decoders are flushed before encoders, which should call ifilter_send_eof(), which will also set these parameters; however due to complex control flow it is hard to be entirely sure this code can never be triggered Even if this code can actually be reached, it is probably better to return an error as the comment above it says.
This commit is contained in:
parent
f5cfb2c5df
commit
48d8d3549a
|
@ -1140,16 +1140,6 @@ void enc_flush(void)
|
|||
"Finishing stream without any data written to it.\n");
|
||||
|
||||
if (ost->filter && !fg->graph) {
|
||||
int x;
|
||||
for (x = 0; x < fg->nb_inputs; x++) {
|
||||
InputFilter *ifilter = fg->inputs[x];
|
||||
if (ifilter->format < 0 &&
|
||||
ifilter_parameters_from_codecpar(ifilter, ifilter->ist->par) < 0) {
|
||||
av_log(ost, AV_LOG_ERROR, "Error copying paramerets from input stream\n");
|
||||
exit_program(1);
|
||||
}
|
||||
}
|
||||
|
||||
if (!ifilter_has_all_input_formats(fg))
|
||||
continue;
|
||||
|
||||
|
|
Loading…
Reference in New Issue