[FFmpeg-devel] [PATCH 2/2] ffmpeg: do not finish output streams manually on eof even if no input is provided
Marton Balint
cus at passwd.hu
Sun Mar 18 21:09:09 EET 2018
The generic code should be able to finish the streams just fine initializing
and flushing the filters and codecs properly.
Signed-off-by: Marton Balint <cus at passwd.hu>
---
fftools/ffmpeg.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 8876c99560..5399397c6e 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -2186,7 +2186,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;
@@ -2213,16 +2213,6 @@ static int ifilter_send_eof(InputFilter *ifilter, int64_t pts)
av_log(NULL, AV_LOG_ERROR, "Cannot determine format of input %d, stream %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;
--
2.13.6
More information about the ffmpeg-devel
mailing list