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 --- libswscale/alphablend.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libswscale/alphablend.c') diff --git a/libswscale/alphablend.c b/libswscale/alphablend.c index 1f63493bdc..b5686599c0 100644 --- a/libswscale/alphablend.c +++ b/libswscale/alphablend.c @@ -50,7 +50,7 @@ int ff_sws_alphablendaway(SwsContext *c, const uint8_t *src[], int w = plane ? c->chrSrcW : c->srcW; int x_subsample = plane ? desc->log2_chroma_w: 0; int y_subsample = plane ? desc->log2_chroma_h: 0; - for (y = srcSliceY >> y_subsample; y < FF_CEIL_RSHIFT(srcSliceH, y_subsample); y++) { + for (y = srcSliceY >> y_subsample; y < AV_CEIL_RSHIFT(srcSliceH, y_subsample); y++) { if (x_subsample || y_subsample) { int alpha; unsigned u; -- cgit v1.2.3