generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avfilter/vf_zoompan: free out AVFrame on failure

Browse Source 
Fixes: CID1197065

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-05-12 19:59:37 +02:00
parent 93b0ee21a2
commit 00f5c8f98d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/vf_zoompan.c
View File

@ -127,7 +127,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
ZPContext *s = ctx->priv; ZPContext *s = ctx->priv;
double var_values[VARS_NB], nb_frames, zoom, dx, dy; double var_values[VARS_NB], nb_frames, zoom, dx, dy;
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(in->format); const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(in->format);
AVFrame *out; AVFrame *out = NULL;
int i, k, x, y, w, h, ret = 0; int i, k, x, y, w, h, ret = 0;
var_values[VAR_IN_W] = var_values[VAR_IW] = in->width; 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); ret = ff_filter_frame(outlink, out);
if (ret < 0) if (ret < 0)
break; break;
out = NULL;
sws_freeContext(s->sws); sws_freeContext(s->sws);
s->sws = NULL; s->sws = NULL;
@ -245,6 +246,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
fail: fail:
sws_freeContext(s->sws); sws_freeContext(s->sws);
s->sws = NULL; s->sws = NULL;
av_frame_free(&out);
av_frame_free(&in); av_frame_free(&in);
return ret; return ret;
} }