diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c
index 8ff8a6be41..1aa6ab0cd3 100644
--- a/libavutil/imgutils.c
+++ b/libavutil/imgutils.c
@@ -69,7 +69,7 @@ int image_get_linesize(int width, int plane,
     linesize = max_step * shifted_w;
 
     if (desc->flags & AV_PIX_FMT_FLAG_BITSTREAM)
-        linesize = (linesize + 7) >> 3;
+        linesize = (linesize >> 3) + !!(linesize & 7);
     return linesize;
 }