summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-14 04:32:05 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-17 23:47:37 +0100
commit4ff77d44512100b8b1258b98491776755f45d30b (patch)
tree17cf5ab0493f3d5e82dfdb24fa53ce3d1c858d2b /ffmpeg.c
parent7d91fb305e5468e0d911eb12e9b4ba65fbbb99ab (diff)
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@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 9cc722fb00..7907f97766 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;