MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'd371c3c2e2830d9783465ecfe1ab7d93351083b7'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2013-05-17 10:51:59 +02:00
commit d5e5e73c52
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/vf_frei0r.c
View File

@ -353,6 +353,8 @@ static int config_input_props(AVFilterLink *inlink)
AVFilterContext *ctx = inlink->dst;
Frei0rContext *s = ctx->priv;
if (s->destruct && s->instance)
s->destruct(s->instance);
if (!(s->instance = s->construct(inlink->w, inlink->h))) {
av_log(ctx, AV_LOG_ERROR, "Impossible to load frei0r instance\n");
return AVERROR(EINVAL);
@ -487,6 +489,8 @@ static int source_config_props(AVFilterLink *outlink)
outlink->time_base = s->time_base;
outlink->sample_aspect_ratio = (AVRational){1,1};
if (s->destruct && s->instance)
s->destruct(s->instance);
if (!(s->instance = s->construct(outlink->w, outlink->h))) {
av_log(ctx, AV_LOG_ERROR, "Impossible to load frei0r instance\n");
return AVERROR(EINVAL);

1
libavfilter/vf_gradfun.c
View File

@ -168,6 +168,7 @@ static int config_input(AVFilterLink *inlink)
int hsub = desc->log2_chroma_w;
int vsub = desc->log2_chroma_h;
av_freep(&s->buf);
s->buf = av_mallocz((FFALIGN(inlink->w, 16) * (s->radius + 1) / 2 + 32) * sizeof(uint16_t));
if (!s->buf)
return AVERROR(ENOMEM);

2
libavfilter/vf_lut.c
View File

@ -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) {