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

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:31:29 2014 +0100| [7d91fb305e5468e0d911eb12e9b4ba65fbbb99ab] | committer: Michael Niedermayer

ffmpeg: check ost->finished in reap_filters()

This avoids finished output streams continuing to receive frames

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

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

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

diff --git a/ffmpeg.c b/ffmpeg.c
index 6c51ad0..9cc722f 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;



More information about the ffmpeg-cvslog mailing list