virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

ffmpeg: avoid endlessly reading from one input while another is unavailable

Browse Source 
Testcase in Ticket 4051

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-10-22 17:08:00 +02:00
parent ec6a5fc6cc
commit 9bdb7a6c1a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ffmpeg.c
View File

@@ -3090,9 +3090,9 @@ static OutputStream *choose_output(void)
OutputStream *ost = output_streams[i]; OutputStream *ost = output_streams[i];
int64_t opts = av_rescale_q(ost->st->cur_dts, ost->st->time_base, int64_t opts = av_rescale_q(ost->st->cur_dts, ost->st->time_base,
AV_TIME_BASE_Q); AV_TIME_BASE_Q);
if (!ost->unavailable && !ost->finished && opts < opts_min) { if (!ost->finished && opts < opts_min) {
opts_min = opts; opts_min = opts;
ost_min = ost; ost_min = ost->unavailable ? NULL : ost;
} }
} }
return ost_min; return ost_min;