avcodec/mpegvideo: use av_clip() instead of nested min & max

Note: MpegEncContext.mb_{y,height} are int fields, as well as local off
variable.

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index d4a84d43e38595b9d53028b3d968a516583a3b29..57d96200622ff110a9bae50e6abcf6dd4d9e681a 100644 (file)
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -2776,7 +2776,7 @@ int ff_mpv_lowest_referenced_row(MpegEncContext *s, int dir)
 
     off = ((FFMAX(-my_min, my_max)<<qpel_shift) + 63) >> 6;
 
-    return FFMIN(FFMAX(s->mb_y + off, 0), s->mb_height-1);
+    return av_clip(s->mb_y + off, 0, s->mb_height - 1);
 unhandled:
     return s->mb_height-1;
 }