diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 15:19:38 +0000 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 16:36:46 +0000 |
commit | 21f946840260da150affd9a20cc35b3d56194ba6 (patch) | |
tree | 5ca004c2ff6cf737f6858a56ce17602c339d80e6 /libavfilter/vf_cover_rect.c | |
parent | 0aada30510d809bccfd539a90ea37b61188f2cb4 (diff) | |
download | ffmpeg-21f946840260da150affd9a20cc35b3d56194ba6.tar.gz |
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 <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavfilter/vf_cover_rect.c')
-rw-r--r-- | libavfilter/vf_cover_rect.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavfilter/vf_cover_rect.c b/libavfilter/vf_cover_rect.c index a84203abc7..f7f61038e3 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; |