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 --- libavcodec/libwebpenc_common.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libavcodec/libwebpenc_common.c') diff --git a/libavcodec/libwebpenc_common.c b/libavcodec/libwebpenc_common.c index a76b6da5d6..21d7adaf56 100644 --- a/libavcodec/libwebpenc_common.c +++ b/libavcodec/libwebpenc_common.c @@ -167,8 +167,8 @@ int ff_libwebp_get_frame(AVCodecContext *avctx, LibWebPContextCommon *s, int sse = 0; for (p = 0; p < 3; p++) { int bs2 = bs >> !!p; - int w = FF_CEIL_RSHIFT(frame->width , !!p); - int h = FF_CEIL_RSHIFT(frame->height, !!p); + int w = AV_CEIL_RSHIFT(frame->width , !!p); + int h = AV_CEIL_RSHIFT(frame->height, !!p); int xs = x >> !!p; int ys = y >> !!p; for (y2 = ys; y2 < FFMIN(ys + bs2, h); y2++) { @@ -183,8 +183,8 @@ int ff_libwebp_get_frame(AVCodecContext *avctx, LibWebPContextCommon *s, if (!skip) for (p = 0; p < 3; p++) { int bs2 = bs >> !!p; - int w = FF_CEIL_RSHIFT(frame->width , !!p); - int h = FF_CEIL_RSHIFT(frame->height, !!p); + int w = AV_CEIL_RSHIFT(frame->width , !!p); + int h = AV_CEIL_RSHIFT(frame->height, !!p); int xs = x >> !!p; int ys = y >> !!p; for (y2 = ys; y2 < FFMIN(ys + bs2, h); y2++) { -- cgit v1.2.3