From 9bdb7a6c1a8bcc36cf276107fb2e6fca12687d40 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 22 Oct 2014 17:08:00 +0200 Subject: [PATCH] ffmpeg: avoid endlessly reading from one input while another is unavailable Testcase in Ticket 4051 Reviewed-by: Nicolas George Signed-off-by: Michael Niedermayer --- ffmpeg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index 051feaec95..e6ba0f6a10 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -3090,9 +3090,9 @@ static OutputStream *choose_output(void) OutputStream *ost = output_streams[i]; int64_t opts = av_rescale_q(ost->st->cur_dts, ost->st->time_base, AV_TIME_BASE_Q); - if (!ost->unavailable && !ost->finished && opts < opts_min) { + if (!ost->finished && opts < opts_min) { opts_min = opts; - ost_min = ost; + ost_min = ost->unavailable ? NULL : ost; } } return ost_min;