Mercurial > mplayer.hg

diff libmpcodecs/vd_ffmpeg.c @ 31270:5f777257f6af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor code simplification.
author reimar
date Sun, 06 Jun 2010 11:23:56 +0000
parents 4cc35c457d9e
children c92b055ebec7
line wrap: on
line diff
--- a/libmpcodecs/vd_ffmpeg.c	Sun Jun 06 11:08:46 2010 +0000
+++ b/libmpcodecs/vd_ffmpeg.c	Sun Jun 06 11:23:56 2010 +0000
@@ -515,7 +515,8 @@
         }
     }
     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);
     }
 }