[vlc-devel] commit: Cosmetic about i_zoom limitation (patch 3/3) (Joseph Tulou )

[git version control]

vlc | branch: master | Joseph Tulou <brezhoneg1 at yahoo.fr> | Fri Feb 13 15:01:59 2009 +0100| [6613969f328c31705a9e155e6ba0ab7d35088691] | committer: Jean-Baptiste Kempf 

Cosmetic about i_zoom limitation (patch 3/3)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6613969f328c31705a9e155e6ba0ab7d35088691
---

 src/video_output/vout_pictures.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/video_output/vout_pictures.c b/src/video_output/vout_pictures.c
index 48ce941..094813b 100644
--- a/src/video_output/vout_pictures.c
+++ b/src/video_output/vout_pictures.c
@@ -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;