diff options
| author | Marton Balint <cus@passwd.hu> | 2018-03-18 18:34:23 +0100 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2018-03-29 00:07:39 +0200 |
| commit | 0031eab61c82af7fca3aff4ced82c6ab9eb4e786 (patch) | |
| tree | 6df452b8d05e7f2053aa818b7844e4d36fab5fc7 /fftools/ffmpeg.c | |
| parent | 60c9a2553041152a32e7093756f728898593a585 (diff) | |
| download | ffmpeg-0031eab61c82af7fca3aff4ced82c6ab9eb4e786.tar.gz | |
ffmpeg: do not finish output streams manually on eof even if no input is provided
The generic code should be able to finish the streams just fine initializing
and flushing the filters and codecs properly.
Fixes the following command:
ffmpeg -f lavfi -i "testsrc=d=0.1[out0];aevalsrc=0:d=0[out1]" -af apad -shortest -f framecrc -
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'fftools/ffmpeg.c')
| -rw-r--r-- | fftools/ffmpeg.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index b72884673d..4fcce8e204 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2188,7 +2188,7 @@ static int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame) static int ifilter_send_eof(InputFilter *ifilter, int64_t pts) { - int i, j, ret; + int ret; ifilter->eof = 1; @@ -2205,16 +2205,6 @@ static int ifilter_send_eof(InputFilter *ifilter, int64_t pts) av_log(NULL, AV_LOG_ERROR, "Cannot determine format of input stream %d:%d after EOF\n", ifilter->ist->file_index, ifilter->ist->st->index); return AVERROR_INVALIDDATA; } - for (i = 0; i < fg->nb_inputs; i++) - if (!fg->inputs[i]->eof) - break; - if (i == fg->nb_inputs) { - // All the input streams have finished without the filtergraph - // ever being configured. - // Mark the output streams as finished. - for (j = 0; j < fg->nb_outputs; j++) - finish_output_stream(fg->outputs[j]->ost); - } } return 0; |