diff --git a/libavformat/yuv4mpegenc.c b/libavformat/yuv4mpegenc.c
index ef1e7753410f9c98e35455e2d9eaff291977f543..83f79d2ce370df89a4614cc490d4872907bc5f8d 100644
--- a/libavformat/yuv4mpegenc.c
+++ b/libavformat/yuv4mpegenc.c
@@ -129,8 +129,8 @@ static int yuv4_write_packet(AVFormatContext *s, AVPacket *pkt)
         av_pix_fmt_get_chroma_sub_sample(st->codec->pix_fmt, &h_chroma_shift,
                                          &v_chroma_shift);
         // Shift right, rounding up
-        width  = -(-width  >> h_chroma_shift);
-        height = -(-height >> v_chroma_shift);
+        width  = AV_CEIL_RSHIFT(width, h_chroma_shift);
+        height = AV_CEIL_RSHIFT(height, v_chroma_shift);
 
         ptr1 = frame->data[1];
         ptr2 = frame->data[2];