[MPlayer-cvslog] r31336 - trunk/libmpcodecs/vd_ffmpeg.c

[reimar]

Author: reimar
Date: Sun Jun  6 13:23:56 2010
New Revision: 31336

Log:
Minor code simplification.

Modified:
   trunk/libmpcodecs/vd_ffmpeg.c

Modified: trunk/libmpcodecs/vd_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/vd_ffmpeg.c	Sun Jun  6 13:08:46 2010	(r31335)
+++ trunk/libmpcodecs/vd_ffmpeg.c	Sun Jun  6 13:23:56 2010	(r31336)
@@ -515,7 +515,8 @@ static void draw_slice(struct AVCodecCon
         }
     }
     if (y < sh->disp_h) {
-        mpcodecs_draw_slice (sh, source, strides, sh->disp_w, (y+height)<=sh->disp_h?height:sh->disp_h-y, 0, y);
+        height = FFMIN(height, sh->disp_h-y);
+        mpcodecs_draw_slice (sh, source, strides, sh->disp_w, height, 0, y);
     }
 }