Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-01-27 18:19:38 +0300
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-01-27 19:36:46 +0300
commit21f946840260da150affd9a20cc35b3d56194ba6 (patch)
tree5ca004c2ff6cf737f6858a56ce17602c339d80e6 /libavfilter/vf_displace.c
parent0aada30510d809bccfd539a90ea37b61188f2cb4 (diff)
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_displace.c')
-rw-r--r--libavfilter/vf_displace.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/vf_displace.c b/libavfilter/vf_displace.c
index b72f043521..9daa0c9ddb 100644
--- a/libavfilter/vf_displace.c
+++ b/libavfilter/vf_displace.c
@@ -257,9 +257,9 @@ static int config_input(AVFilterLink *inlink)
s->step = av_get_padded_bits_per_pixel(desc) >> 3;
hsub = desc->log2_chroma_w;
vsub = desc->log2_chroma_h;
- s->height[1] = s->height[2] = FF_CEIL_RSHIFT(inlink->h, vsub);
+ s->height[1] = s->height[2] = AV_CEIL_RSHIFT(inlink->h, vsub);
s->height[0] = s->height[3] = inlink->h;
- s->width[1] = s->width[2] = FF_CEIL_RSHIFT(inlink->w, hsub);
+ s->width[1] = s->width[2] = AV_CEIL_RSHIFT(inlink->w, hsub);
s->width[0] = s->width[3] = inlink->w;
return 0;