From 21f946840260da150affd9a20cc35b3d56194ba6 Mon Sep 17 00:00:00 2001 From: Derek Buitenhuis Date: Wed, 27 Jan 2016 15:19:38 +0000 Subject: avutil: Rename FF_CEIL_COMPAT to AV_CEIL_COMPAT Libav, for some reason, merged this as a public API function. This will aid in future merges. A define is left for backwards compat, just in case some person used it, since it is in a public header. Signed-off-by: Derek Buitenhuis --- libavfilter/vf_rotate.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libavfilter/vf_rotate.c') diff --git a/libavfilter/vf_rotate.c b/libavfilter/vf_rotate.c index 36c4a7a32b..47dc01e7d8 100644 --- a/libavfilter/vf_rotate.c +++ b/libavfilter/vf_rotate.c @@ -494,11 +494,11 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) for (plane = 0; plane < rot->nb_planes; plane++) { int hsub = plane == 1 || plane == 2 ? rot->hsub : 0; int vsub = plane == 1 || plane == 2 ? rot->vsub : 0; - const int outw = FF_CEIL_RSHIFT(outlink->w, hsub); - const int outh = FF_CEIL_RSHIFT(outlink->h, vsub); + const int outw = AV_CEIL_RSHIFT(outlink->w, hsub); + const int outh = AV_CEIL_RSHIFT(outlink->h, vsub); ThreadData td = { .in = in, .out = out, - .inw = FF_CEIL_RSHIFT(inlink->w, hsub), - .inh = FF_CEIL_RSHIFT(inlink->h, vsub), + .inw = AV_CEIL_RSHIFT(inlink->w, hsub), + .inh = AV_CEIL_RSHIFT(inlink->h, vsub), .outh = outh, .outw = outw, .xi = -(outw-1) * c / 2, .yi = (outw-1) * s / 2, .xprime = -(outh-1) * s / 2, -- cgit v1.2.3