[FFmpeg-cvslog] ffmpeg: check ost->finished in check_output_constraints()

Michael Niedermayer git at videolan.org
Sat Jan 18 00:06:47 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 14 04:32:05 2014 +0100| [4ff77d44512100b8b1258b98491776755f45d30b] | committer: Michael Niedermayer

ffmpeg: check ost->finished in check_output_constraints()

No testcase but it seems logic to stop when finished is set

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4ff77d44512100b8b1258b98491776755f45d30b
---

 ffmpeg.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/ffmpeg.c b/ffmpeg.c
index 9cc722f..7907f97 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1407,6 +1407,9 @@ static int check_output_constraints(InputStream *ist, OutputStream *ost)
     if (ost->source_index != ist_index)
         return 0;
 
+    if (ost->finished)
+        return 0;
+
     if (of->start_time != AV_NOPTS_VALUE && ist->pts < of->start_time)
         return 0;
 



More information about the ffmpeg-cvslog mailing list