X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fvf_swaprect.c;h=f1fab1e36d027fb7ac2c4cedbf6d94156ceaa190;hb=e37741d26a1ef2d07e2ccf4e1bc9699a12576111;hp=f96f89781835f2091690010090341db28c3129df;hpb=0cc8e34a94c84132cf5b0f6472c5f61c8a66cee1;p=ffmpeg diff --git a/libavfilter/vf_swaprect.c b/libavfilter/vf_swaprect.c index f96f8978183..f1fab1e36d0 100644 --- a/libavfilter/vf_swaprect.c +++ b/libavfilter/vf_swaprect.c @@ -151,32 +151,32 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) x2[0] = av_clip(x2[0], 0, inlink->w - 1); y2[0] = av_clip(y2[0], 0, inlink->w - 1); - ah[1] = ah[2] = FF_CEIL_RSHIFT(h, s->desc->log2_chroma_h); + ah[1] = ah[2] = AV_CEIL_RSHIFT(h, s->desc->log2_chroma_h); ah[0] = ah[3] = h; - aw[1] = aw[2] = FF_CEIL_RSHIFT(w, s->desc->log2_chroma_w); + aw[1] = aw[2] = AV_CEIL_RSHIFT(w, s->desc->log2_chroma_w); aw[0] = aw[3] = w; w = FFMIN3(w, inlink->w - x1[0], inlink->w - x2[0]); h = FFMIN3(h, inlink->h - y1[0], inlink->h - y2[0]); - ph[1] = ph[2] = FF_CEIL_RSHIFT(h, s->desc->log2_chroma_h); + ph[1] = ph[2] = AV_CEIL_RSHIFT(h, s->desc->log2_chroma_h); ph[0] = ph[3] = h; - pw[1] = pw[2] = FF_CEIL_RSHIFT(w, s->desc->log2_chroma_w); + pw[1] = pw[2] = AV_CEIL_RSHIFT(w, s->desc->log2_chroma_w); pw[0] = pw[3] = w; - lh[1] = lh[2] = FF_CEIL_RSHIFT(inlink->h, s->desc->log2_chroma_h); + lh[1] = lh[2] = AV_CEIL_RSHIFT(inlink->h, s->desc->log2_chroma_h); lh[0] = lh[3] = inlink->h; - lw[1] = lw[2] = FF_CEIL_RSHIFT(inlink->w, s->desc->log2_chroma_w); + lw[1] = lw[2] = AV_CEIL_RSHIFT(inlink->w, s->desc->log2_chroma_w); lw[0] = lw[3] = inlink->w; - x1[1] = x1[2] = FF_CEIL_RSHIFT(x1[0], s->desc->log2_chroma_w); + x1[1] = x1[2] = AV_CEIL_RSHIFT(x1[0], s->desc->log2_chroma_w); x1[0] = x1[3] = x1[0]; - y1[1] = y1[2] = FF_CEIL_RSHIFT(y1[0], s->desc->log2_chroma_h); + y1[1] = y1[2] = AV_CEIL_RSHIFT(y1[0], s->desc->log2_chroma_h); y1[0] = y1[3] = y1[0]; - x2[1] = x2[2] = FF_CEIL_RSHIFT(x2[0], s->desc->log2_chroma_w); + x2[1] = x2[2] = AV_CEIL_RSHIFT(x2[0], s->desc->log2_chroma_w); x2[0] = x2[3] = x2[0]; - y2[1] = y2[2] = FF_CEIL_RSHIFT(y2[0], s->desc->log2_chroma_h); + y2[1] = y2[2] = AV_CEIL_RSHIFT(y2[0], s->desc->log2_chroma_h); y2[0] = y2[3] = y2[0]; for (p = 0; p < s->nb_planes; p++) {