diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-17 13:28:15 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-17 13:29:22 +0400 |
| commit | 71fcb6072ea6258b28e6267a3d7d5287569b2f26 (patch) | |
| tree | 60e319e1c9bf07580a9a50194be7cf7758801154 /libavfilter/vf_crop.c | |
| parent | c7078f4907dcff6877cf38f48526788c10644f07 (diff) | |
| parent | 3fb29588a27a711132106b924e27b53789a58dcb (diff) | |
Merge commit '3fb29588a27a711132106b924e27b53789a58dcb'
* commit '3fb29588a27a711132106b924e27b53789a58dcb':
vf_drawtext: don't leak the expressions.
vf_crop: make config_props work properly when called multiple times.
vf_setdar: make config_props work properly when called multiple times.
Conflicts:
libavfilter/vf_aspect.c
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_crop.c')
| -rw-r--r-- | libavfilter/vf_crop.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c index 4edb7cfb05..7ba99d1d75 100644 --- a/libavfilter/vf_crop.c +++ b/libavfilter/vf_crop.c @@ -204,6 +204,9 @@ static int config_input(AVFilterLink *link) s->w &= ~((1 << s->hsub) - 1); s->h &= ~((1 << s->vsub) - 1); + av_expr_free(s->x_pexpr); + av_expr_free(s->y_pexpr); + s->x_pexpr = s->y_pexpr = NULL; if ((ret = av_expr_parse(&s->x_pexpr, s->x_expr, var_names, NULL, NULL, NULL, NULL, 0, ctx)) < 0 || (ret = av_expr_parse(&s->y_pexpr, s->y_expr, var_names, |