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_unsharp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libavfilter/vf_unsharp.c') diff --git a/libavfilter/vf_unsharp.c b/libavfilter/vf_unsharp.c index a56b023460..d264e24e3c 100644 --- a/libavfilter/vf_unsharp.c +++ b/libavfilter/vf_unsharp.c @@ -109,9 +109,9 @@ static int apply_unsharp_c(AVFilterContext *ctx, AVFrame *in, AVFrame *out) int i, plane_w[3], plane_h[3]; UnsharpFilterParam *fp[3]; plane_w[0] = inlink->w; - plane_w[1] = plane_w[2] = FF_CEIL_RSHIFT(inlink->w, s->hsub); + plane_w[1] = plane_w[2] = AV_CEIL_RSHIFT(inlink->w, s->hsub); plane_h[0] = inlink->h; - plane_h[1] = plane_h[2] = FF_CEIL_RSHIFT(inlink->h, s->vsub); + plane_h[1] = plane_h[2] = AV_CEIL_RSHIFT(inlink->h, s->vsub); fp[0] = &s->luma; fp[1] = fp[2] = &s->chroma; for (i = 0; i < 3; i++) { @@ -204,7 +204,7 @@ static int config_props(AVFilterLink *link) ret = init_filter_param(link->dst, &s->luma, "luma", link->w); if (ret < 0) return ret; - ret = init_filter_param(link->dst, &s->chroma, "chroma", FF_CEIL_RSHIFT(link->w, s->hsub)); + ret = init_filter_param(link->dst, &s->chroma, "chroma", AV_CEIL_RSHIFT(link->w, s->hsub)); if (ret < 0) return ret; -- cgit v1.2.3