[FFmpeg-cvslog] avfilter/vf_zoompan: free out AVFrame on failure
Michael Niedermayer
git at videolan.org
Wed May 13 02:22:10 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 12 19:59:37 2015 +0200| [00f5c8f98de69abbcb5b2ca94b91efd9b22dfe36] | committer: Michael Niedermayer
avfilter/vf_zoompan: free out AVFrame on failure
Fixes: CID1197065
Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=00f5c8f98de69abbcb5b2ca94b91efd9b22dfe36
---
libavfilter/vf_zoompan.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavfilter/vf_zoompan.c b/libavfilter/vf_zoompan.c
index d126851..c49193a 100644
--- a/libavfilter/vf_zoompan.c
+++ b/libavfilter/vf_zoompan.c
@@ -127,7 +127,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
ZPContext *s = ctx->priv;
double var_values[VARS_NB], nb_frames, zoom, dx, dy;
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(in->format);
- AVFrame *out;
+ AVFrame *out = NULL;
int i, k, x, y, w, h, ret = 0;
var_values[VAR_IN_W] = var_values[VAR_IW] = in->width;
@@ -232,6 +232,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
ret = ff_filter_frame(outlink, out);
if (ret < 0)
break;
+ out = NULL;
sws_freeContext(s->sws);
s->sws = NULL;
@@ -245,6 +246,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
fail:
sws_freeContext(s->sws);
s->sws = NULL;
+ av_frame_free(&out);
av_frame_free(&in);
return ret;
}
More information about the ffmpeg-cvslog
mailing list