X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fvf_crop.c;h=84be4c7d0d2405e14fd301fdec05dfb4ef4c7cd7;hb=d29c35b4d8f1ce93058697e9819fda8684928109;hp=7c31c1665d91c9d3296ff597cf5be70f97bac60a;hpb=529de4f1b6ae92e27fdd5e2420e03908b31e9425;p=ffmpeg diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c index 7c31c1665d9..84be4c7d0d2 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]); @@ -287,7 +288,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *frame) frame->data[0] += s->y * frame->linesize[0]; frame->data[0] += s->x * s->max_step[0]; - if (!(desc->flags & AV_PIX_FMT_FLAG_PAL || desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL)) { + if (!(desc->flags & AV_PIX_FMT_FLAG_PAL || desc->flags & FF_PSEUDOPAL)) { for (i = 1; i < 3; i ++) { if (frame->data[i]) { frame->data[i] += (s->y >> s->vsub) * frame->linesize[i];