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_displace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavfilter/vf_displace.c') diff --git a/libavfilter/vf_displace.c b/libavfilter/vf_displace.c index b72f043521..9daa0c9ddb 100644 --- a/libavfilter/vf_displace.c +++ b/libavfilter/vf_displace.c @@ -257,9 +257,9 @@ static int config_input(AVFilterLink *inlink) s->step = av_get_padded_bits_per_pixel(desc) >> 3; hsub = desc->log2_chroma_w; vsub = desc->log2_chroma_h; - s->height[1] = s->height[2] = FF_CEIL_RSHIFT(inlink->h, vsub); + s->height[1] = s->height[2] = AV_CEIL_RSHIFT(inlink->h, vsub); s->height[0] = s->height[3] = inlink->h; - s->width[1] = s->width[2] = FF_CEIL_RSHIFT(inlink->w, hsub); + s->width[1] = s->width[2] = AV_CEIL_RSHIFT(inlink->w, hsub); s->width[0] = s->width[3] = inlink->w; return 0; -- cgit v1.2.3