summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-14 04:31:29 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-17 23:47:36 +0100
commit7d91fb305e5468e0d911eb12e9b4ba65fbbb99ab (patch)
treed1a67098f4cf02d648c23c0183b174299492bd3c /ffmpeg.c
parented7f1a5c207636c80795e683d7808411d3c7ab3e (diff)
ffmpeg: check ost->finished in reap_filters()
This avoids finished output streams continuing to receive frames Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 6c51ad0f3c..9cc722fb00 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1093,6 +1093,10 @@ static int reap_filters(void)
}
break;
}
+ if (ost->finished) {
+ av_frame_unref(filtered_frame);
+ continue;
+ }
frame_pts = AV_NOPTS_VALUE;
if (filtered_frame->pts != AV_NOPTS_VALUE) {
int64_t start_time = (of->start_time == AV_NOPTS_VALUE) ? 0 : of->start_time;