[FFmpeg-devel] [PATCH] ffmpeg: avoid endlessly reading from one input while another is unavailable

Michael Niedermayer michaelni at gmx.at
Wed Oct 22 17:14:19 CEST 2014


Testcase in Ticket 4051

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
---
 ffmpeg.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 051feae..e6ba0f6 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;
-- 
1.7.9.5



More information about the ffmpeg-devel mailing list