aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale/vscale.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 /libswscale/vscale.c
parent0aada30510d809bccfd539a90ea37b61188f2cb4 (diff)
downloadffmpeg-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 'libswscale/vscale.c')
-rw-r--r--libswscale/vscale.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libswscale/vscale.c b/libswscale/vscale.c
index 39e1eec9bb..72f799de1a 100644
--- a/libswscale/vscale.c
+++ b/libswscale/vscale.c
@@ -70,7 +70,7 @@ static int chr_planar_vscale(SwsContext *c, SwsFilterDescriptor *desc, int slice
return 0;
else {
VScalerContext *inst = desc->instance;
- int dstW = FF_CEIL_RSHIFT(desc->dst->width, desc->dst->h_chr_sub_sample);
+ int dstW = AV_CEIL_RSHIFT(desc->dst->width, desc->dst->h_chr_sub_sample);
int chrSliceY = sliceY >> desc->dst->v_chr_sub_sample;
int first = FFMAX(1-inst->filter_size, inst->filter_pos[chrSliceY]);