From: Steven Liu Date: Thu, 1 Feb 2018 02:55:19 +0000 (+0800) Subject: avfilter: add comments for duplicate line X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=27fe8930e0b9e7881e61eb9ed0b8b526f718abfe;p=ffmpeg avfilter: add comments for duplicate line comment about the looks like a duplicate line. but that is used to reason x is expressed from y Suggested-by: Paul B Mahol Suggested-by: Michael Niedermayer Signed-off-by: Steven Liu --- diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c index 7c31c1665d9..0fdc4949e3b 100644 --- a/libavfilter/vf_crop.c +++ b/libavfilter/vf_crop.c @@ -262,6 +262,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *frame) NAN : frame->pkt_pos; s->var_values[VAR_X] = av_expr_eval(s->x_pexpr, s->var_values, NULL); s->var_values[VAR_Y] = av_expr_eval(s->y_pexpr, s->var_values, NULL); + /* It is necessary if x is expressed from y */ s->var_values[VAR_X] = av_expr_eval(s->x_pexpr, s->var_values, NULL); normalize_double(&s->x, s->var_values[VAR_X]); diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index f97a741b508..e8905a40d3e 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -1390,6 +1390,7 @@ static int draw_text(AVFilterContext *ctx, AVFrame *frame, s->x = s->var_values[VAR_X] = av_expr_eval(s->x_pexpr, s->var_values, &s->prng); s->y = s->var_values[VAR_Y] = av_expr_eval(s->y_pexpr, s->var_values, &s->prng); + /* It is necessary if x is expressed from y */ s->x = s->var_values[VAR_X] = av_expr_eval(s->x_pexpr, s->var_values, &s->prng); update_alpha(s); diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index aa5835ae3ab..c6a6ac82f39 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -149,6 +149,7 @@ static void eval_expr(AVFilterContext *ctx) s->var_values[VAR_X] = av_expr_eval(s->x_pexpr, s->var_values, NULL); s->var_values[VAR_Y] = av_expr_eval(s->y_pexpr, s->var_values, NULL); + /* It is necessary if x is expressed from y */ s->var_values[VAR_X] = av_expr_eval(s->x_pexpr, s->var_values, NULL); s->x = normalize_xy(s->var_values[VAR_X], s->hsub); s->y = normalize_xy(s->var_values[VAR_Y], s->vsub);