diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c
index 5d8934b3c6..cc7c3e2114 100644
--- a/libavfilter/vf_yadif.c
+++ b/libavfilter/vf_yadif.c
@@ -187,8 +187,8 @@ static void filter(AVFilterContext *ctx, AVFrame *dstpic,
 
         if (i == 1 || i == 2) {
         /* Why is this not part of the per-plane description thing? */
-            w >>= yadif->csp->log2_chroma_w;
-            h >>= yadif->csp->log2_chroma_h;
+            w = FF_CEIL_RSHIFT(w, yadif->csp->log2_chroma_w);
+            h = FF_CEIL_RSHIFT(h, yadif->csp->log2_chroma_h);
         }
 
         /* filtering reads 3 pixels to the left/right; to avoid invalid reads,