[FFmpeg-cvslog] avfilter/vf_zoompan: do not free frame we pushed to lavfi

Paul B Mahol git at videolan.org
Sat Jan 2 21:27:43 CET 2016


ffmpeg | branch: release/2.8 | Paul B Mahol <onemda at gmail.com> | Sat Jan  2 18:51:11 2016 +0100| [6a1bf98b3af1d02946d6b151e53bb5a2300f88de] | committer: Carl Eugen Hoyos

avfilter/vf_zoompan: do not free frame we pushed to lavfi

Signed-off-by: Paul B Mahol <onemda at gmail.com>
(cherry picked from commit 8bcd1997eadb0d79a049227a1d1afe6111397baa)

Fixes ticket #5113.

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

 libavfilter/vf_zoompan.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/vf_zoompan.c b/libavfilter/vf_zoompan.c
index fb6acd4..c65ce56 100644
--- a/libavfilter/vf_zoompan.c
+++ b/libavfilter/vf_zoompan.c
@@ -230,9 +230,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
         s->frame_count++;
 
         ret = ff_filter_frame(outlink, out);
+        out = NULL;
         if (ret < 0)
             break;
-        out = NULL;
 
         sws_freeContext(s->sws);
         s->sws = NULL;



More information about the ffmpeg-cvslog mailing list