summaryrefslogtreecommitdiffstats
path: root/libavfilter/unsharp_opencl.c
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-01-27 15:19:38 +0000
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-01-27 16:36:46 +0000
commit21f946840260da150affd9a20cc35b3d56194ba6 (patch)
tree5ca004c2ff6cf737f6858a56ce17602c339d80e6 /libavfilter/unsharp_opencl.c
parent0aada30510d809bccfd539a90ea37b61188f2cb4 (diff)
downloadffmpeg-streaming-21f946840260da150affd9a20cc35b3d56194ba6.zip
ffmpeg-streaming-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/unsharp_opencl.c')
-rw-r--r--libavfilter/unsharp_opencl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/unsharp_opencl.c b/libavfilter/unsharp_opencl.c
index 2cc0704..d84920c 100644
--- a/libavfilter/unsharp_opencl.c
+++ b/libavfilter/unsharp_opencl.c
@@ -170,8 +170,8 @@ int ff_opencl_apply_unsharp(AVFilterContext *ctx, AVFrame *in, AVFrame *out)
FFOpenclParam kernel2 = {0};
int width = link->w;
int height = link->h;
- int cw = FF_CEIL_RSHIFT(link->w, unsharp->hsub);
- int ch = FF_CEIL_RSHIFT(link->h, unsharp->vsub);
+ int cw = AV_CEIL_RSHIFT(link->w, unsharp->hsub);
+ int ch = AV_CEIL_RSHIFT(link->h, unsharp->vsub);
size_t globalWorkSize1d = width * height + 2 * ch * cw;
size_t globalWorkSize2dLuma[2];
size_t globalWorkSize2dChroma[2];
@@ -385,7 +385,7 @@ int ff_opencl_unsharp_process_inout_buf(AVFilterContext *ctx, AVFrame *in, AVFra
int ret = 0;
AVFilterLink *link = ctx->inputs[0];
UnsharpContext *unsharp = ctx->priv;
- int ch = FF_CEIL_RSHIFT(link->h, unsharp->vsub);
+ int ch = AV_CEIL_RSHIFT(link->h, unsharp->vsub);
if ((!unsharp->opencl_ctx.cl_inbuf) || (!unsharp->opencl_ctx.cl_outbuf)) {
unsharp->opencl_ctx.in_plane_size[0] = (in->linesize[0] * in->height);
OpenPOWER on IntegriCloud