Cosmetic about i_zoom limitation (patch 3/3)
authorJoseph Tulou <brezhoneg1@yahoo.fr>
Fri, 13 Feb 2009 14:01:59 +0000 (15:01 +0100)
committerJean-Baptiste Kempf <jb@videolan.org>
Sat, 14 Feb 2009 16:47:42 +0000 (17:47 +0100)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
src/video_output/vout_pictures.c

index 48ce941..094813b 100644 (file)
@@ -470,8 +470,8 @@ void vout_PlacePicture( const vout_thread_t *p_vout,
     {
         int i_zoom = p_vout->i_zoom;
         /* be realistic, scaling factor confined between .2 and 10. */
-        if( i_zoom > 10 * ZOOM_FP_FACTOR  || i_zoom <  ZOOM_FP_FACTOR / 5 )
-            i_zoom = ZOOM_FP_FACTOR;
+        if( i_zoom > 10 * ZOOM_FP_FACTOR )      i_zoom = 10 * ZOOM_FP_FACTOR;
+        else if( i_zoom <  ZOOM_FP_FACTOR / 5 ) i_zoom = ZOOM_FP_FACTOR / 5;
 
         unsigned int i_original_width, i_original_height;