virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

vsrc_buffer: Store allocated scale filter and free it later.

Browse Source 
Fixes a memleak.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-03-31 08:49:18 +02:00
parent c5f9a66f74
commit 2d54bbb950
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavfilter/vsrc_buffer.c
View File

@@ -32,6 +32,7 @@
typedef struct { typedef struct {
AVFilterBufferRef *picref; AVFilterBufferRef *picref;
AVFilterContext *scale;
int h, w; int h, w;
enum PixelFormat pix_fmt; enum PixelFormat pix_fmt;
AVRational time_base; ///< time_base to set in the output link AVRational time_base; ///< time_base to set in the output link
@@ -81,14 +82,14 @@ int av_vsrc_buffer_add_video_buffer_ref(AVFilterContext *buffer_filter,
if ((ret = avfilter_open(&scale, f, "Input equalizer")) < 0) if ((ret = avfilter_open(&scale, f, "Input equalizer")) < 0)
return ret; return ret;
c->scale = scale;
snprintf(scale_param, sizeof(scale_param)-1, "%d:%d:%s", c->w, c->h, c->sws_param); snprintf(scale_param, sizeof(scale_param)-1, "%d:%d:%s", c->w, c->h, c->sws_param);
if ((ret = avfilter_init_filter(scale, scale_param, NULL)) < 0) { if ((ret = avfilter_init_filter(scale, scale_param, NULL)) < 0) {
avfilter_free(scale);
return ret; return ret;
} }
if ((ret = avfilter_insert_filter(buffer_filter->outputs[0], scale, 0, 0)) < 0) { if ((ret = avfilter_insert_filter(buffer_filter->outputs[0], scale, 0, 0)) < 0) {
avfilter_free(scale);
return ret; return ret;
} }
scale->outputs[0]->time_base = scale->inputs[0]->time_base; scale->outputs[0]->time_base = scale->inputs[0]->time_base;
@@ -188,6 +189,8 @@ static av_cold void uninit(AVFilterContext *ctx)
if (s->picref) if (s->picref)
avfilter_unref_buffer(s->picref); avfilter_unref_buffer(s->picref);
s->picref = NULL; s->picref = NULL;
avfilter_free(s->scale);
s->scale = NULL;
} }
static int query_formats(AVFilterContext *ctx) static int query_formats(AVFilterContext *ctx)