X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fvf_cover_rect.c;h=f7f61038e39b2ca2f93d132fa21f6f59dddd2f58;hb=949d6dd51ce17c6ad62d257022ad9a75bc4cba73;hp=a84203abc734b7b05167f16d0973b3ee28836d88;hpb=5e8b05345243cdec3ca01116ce130da812ffed3d;p=ffmpeg diff --git a/libavfilter/vf_cover_rect.c b/libavfilter/vf_cover_rect.c index a84203abc73..f7f61038e39 100644 --- a/libavfilter/vf_cover_rect.c +++ b/libavfilter/vf_cover_rect.c @@ -78,8 +78,8 @@ static void cover_rect(CoverContext *cover, AVFrame *in, int offx, int offy) for (p = 0; p < 3; p++) { uint8_t *data = in->data[p] + (offx>>!!p) + (offy>>!!p) * in->linesize[p]; const uint8_t *src = cover->cover_frame->data[p]; - int w = FF_CEIL_RSHIFT(cover->cover_frame->width , !!p); - int h = FF_CEIL_RSHIFT(cover->cover_frame->height, !!p); + int w = AV_CEIL_RSHIFT(cover->cover_frame->width , !!p); + int h = AV_CEIL_RSHIFT(cover->cover_frame->height, !!p); for (y = 0; y < h; y++) { for (x = 0; x < w; x++) { data[x] = src[x]; @@ -98,10 +98,10 @@ static void blur(CoverContext *cover, AVFrame *in, int offx, int offy) int oy = offy>>!!p; int stride = in->linesize[p]; uint8_t *data = in->data[p] + ox + oy * stride; - int w = FF_CEIL_RSHIFT(cover->width , !!p); - int h = FF_CEIL_RSHIFT(cover->height, !!p); - int iw = FF_CEIL_RSHIFT(in->width , !!p); - int ih = FF_CEIL_RSHIFT(in->height, !!p); + int w = AV_CEIL_RSHIFT(cover->width , !!p); + int h = AV_CEIL_RSHIFT(cover->height, !!p); + int iw = AV_CEIL_RSHIFT(in->width , !!p); + int ih = AV_CEIL_RSHIFT(in->height, !!p); for (y = 0; y < h; y++) { for (x = 0; x < w; x++) { int c = 0;