Merge commit 'e8bc642202c10beda1ea4e93ec8492b1e39805e5'

[ffmpeg] / libswscale / alphablend.c

diff --git a/libswscale/alphablend.c b/libswscale/alphablend.c
index 1f63493bdccb482fc915b54dbc5c479d6330063f..b5686599c009131525222ae0ce006cd60170cfd3 100644 (file)
--- 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;