Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-17 13:41:09 +0400
committerMichael Niedermayer <michaelni@gmx.at>2013-05-17 13:41:14 +0400
commit1e9a050bc020825094684ba27fc28025bf0a8088 (patch)
treec6fa6d06f319ff52970b3f28451d7ec66c9f23f9 /libavfilter/vf_pixdesctest.c
parent71fcb6072ea6258b28e6267a3d7d5287569b2f26 (diff)
parent16a645adeb758207346a4bbf66766f02734c461e (diff)
Merge commit '16a645adeb758207346a4bbf66766f02734c461e'
* commit '16a645adeb758207346a4bbf66766f02734c461e': vf_pixdesctest: make config_props work properly when called multiple times. vf_hqdn3d: make config_props work properly when called multiple times. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_pixdesctest.c')
-rw-r--r--libavfilter/vf_pixdesctest.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavfilter/vf_pixdesctest.c b/libavfilter/vf_pixdesctest.c
index 7fd2c78f63..55e6e39638 100644
--- a/libavfilter/vf_pixdesctest.c
+++ b/libavfilter/vf_pixdesctest.c
@@ -46,6 +46,7 @@ static int config_props(AVFilterLink *inlink)
priv->pix_desc = av_pix_fmt_desc_get(inlink->format);
+ av_freep(&priv->line);
if (!(priv->line = av_malloc(sizeof(*priv->line) * inlink->w)))
return AVERROR(ENOMEM);