From 21f946840260da150affd9a20cc35b3d56194ba6 Mon Sep 17 00:00:00 2001 From: Derek Buitenhuis Date: Wed, 27 Jan 2016 15:19:38 +0000 Subject: 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 --- libavfilter/vf_tinterlace.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libavfilter/vf_tinterlace.c') diff --git a/libavfilter/vf_tinterlace.c b/libavfilter/vf_tinterlace.c index 3d6140fcc7..835ece3ebb 100644 --- a/libavfilter/vf_tinterlace.c +++ b/libavfilter/vf_tinterlace.c @@ -137,7 +137,7 @@ static int config_out_props(AVFilterLink *outlink) /* fill black picture with black */ for (i = 0; i < 4 && tinterlace->black_data[i]; i++) { - int h = i == 1 || i == 2 ? FF_CEIL_RSHIFT(outlink->h, desc->log2_chroma_h) : outlink->h; + int h = i == 1 || i == 2 ? AV_CEIL_RSHIFT(outlink->h, desc->log2_chroma_h) : outlink->h; memset(tinterlace->black_data[i], black[i], tinterlace->black_linesize[i] * h); } @@ -211,8 +211,8 @@ void copy_picture_field(TInterlaceContext *tinterlace, int h; for (plane = 0; plane < desc->nb_components; plane++) { - int lines = plane == 1 || plane == 2 ? FF_CEIL_RSHIFT(src_h, vsub) : src_h; - int cols = plane == 1 || plane == 2 ? FF_CEIL_RSHIFT( w, hsub) : w; + int lines = plane == 1 || plane == 2 ? AV_CEIL_RSHIFT(src_h, vsub) : src_h; + int cols = plane == 1 || plane == 2 ? AV_CEIL_RSHIFT( w, hsub) : w; uint8_t *dstp = dst[plane]; const uint8_t *srcp = src[plane]; -- cgit v1.2.3