diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-17 10:51:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-17 10:51:59 +0200 |
| commit | d5e5e73c52d3e2e1d853b2d485223d3c7b01da4f (patch) | |
| tree | e45e9c33d49036e03e84c6bd352ae3c05c5e823a /libavfilter/vf_lut.c | |
| parent | 5bc892cb17225c8bfd54c12abf45012f393f03e3 (diff) | |
| parent | d371c3c2e2830d9783465ecfe1ab7d93351083b7 (diff) | |
Merge commit 'd371c3c2e2830d9783465ecfe1ab7d93351083b7'
* commit 'd371c3c2e2830d9783465ecfe1ab7d93351083b7':
vf_frei0r: make config_props work properly when called multiple times.
vf_gradfun: make config_props work properly when called multiple times.
vf_lut: make config_props work properly when called multiple times.
Conflicts:
libavfilter/vf_lut.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_lut.c')
| -rw-r--r-- | libavfilter/vf_lut.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavfilter/vf_lut.c b/libavfilter/vf_lut.c index 7a6da5ec11..68320d0b41 100644 --- a/libavfilter/vf_lut.c +++ b/libavfilter/vf_lut.c @@ -221,6 +221,8 @@ static int config_props(AVFilterLink *inlink) int comp = s->is_rgb ? rgba_map[color] : color; /* create the parsed expression */ + av_expr_free(s->comp_expr[color]); + s->comp_expr[color] = NULL; ret = av_expr_parse(&s->comp_expr[color], s->comp_expr_str[color], var_names, funcs1_names, funcs1, NULL, NULL, 0, ctx); if (ret < 0) { |