Merge commit '09f4822e4eaf61513b9092414450f3ae920ccd9d'

[ffmpeg] / libavfilter / vf_transpose.c

diff --git a/libavfilter/vf_transpose.c b/libavfilter/vf_transpose.c
index 3b6e36ad8fdc92819b12797b0c0f90f7e9996927..9555ff20c87a795f6ebc2ce8f3cab75efe2dffe8 100644 (file)
--- a/libavfilter/vf_transpose.c
+++ b/libavfilter/vf_transpose.c
@@ -152,9 +152,9 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr,
         int hsub    = plane == 1 || plane == 2 ? s->hsub : 0;
         int vsub    = plane == 1 || plane == 2 ? s->vsub : 0;
         int pixstep = s->pixsteps[plane];
-        int inh     = FF_CEIL_RSHIFT(in->height, vsub);
-        int outw    = FF_CEIL_RSHIFT(out->width,  hsub);
-        int outh    = FF_CEIL_RSHIFT(out->height, vsub);
+        int inh     = AV_CEIL_RSHIFT(in->height, vsub);
+        int outw    = AV_CEIL_RSHIFT(out->width,  hsub);
+        int outh    = AV_CEIL_RSHIFT(out->height, vsub);
         int start   = (outh *  jobnr   ) / nb_jobs;
         int end     = (outh * (jobnr+1)) / nb_jobs;
         uint8_t *dst, *src;