Fix VLC_CLIP usage (and potential divisions by zero)

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

diff --git a/modules/video_splitter/panoramix.c b/modules/video_splitter/panoramix.c
index e876942f627814c2a9accd44e5f7d7fb078e33be..9de7efa53f5fc75c6b51e5123a50b053ca15fcbb 100644 (file)
--- a/modules/video_splitter/panoramix.c
+++ b/modules/video_splitter/panoramix.c
@@ -501,8 +501,8 @@ static int Open( vlc_object_t *p_this )
     p_sys->a_0 =  p_sys->bz_begin;
 
     /* */
-    p_sys->i_col = VLC_CLIP( COL_MAX, 1, p_sys->i_col );
-    p_sys->i_row = VLC_CLIP( ROW_MAX, 1, p_sys->i_row );
+    p_sys->i_col = VLC_CLIP( p_sys->i_col, 1, COL_MAX );
+    p_sys->i_row = VLC_CLIP( p_sys->i_row, 1, ROW_MAX );
     msg_Dbg( p_splitter, "opening a %i x %i wall",
              p_sys->i_col, p_sys->i_row );
 

diff --git a/modules/video_splitter/wall.c b/modules/video_splitter/wall.c
index 24e93849cc759ba1bcd003ddb963270e8998b722..5be60dcf313233e8b61a0b6ea5541cf953cecf4c 100644 (file)
--- a/modules/video_splitter/wall.c
+++ b/modules/video_splitter/wall.c
@@ -137,10 +137,10 @@ static int Open( vlc_object_t *p_this )
 
     /* */
     p_sys->i_col = var_CreateGetInteger( p_splitter, CFG_PREFIX "cols" );
-    p_sys->i_col = VLC_CLIP( COL_MAX, 1, p_sys->i_col );
+    p_sys->i_col = VLC_CLIP( p_sys->i_col, 1, COL_MAX );
 
     p_sys->i_row = var_CreateGetInteger( p_splitter, CFG_PREFIX "rows" );
-    p_sys->i_row = VLC_CLIP( ROW_MAX, 1, p_sys->i_row );
+    p_sys->i_row = VLC_CLIP( p_sys->i_row, 1, ROW_MAX );
 
     msg_Dbg( p_splitter, "opening a %i x %i wall",
              p_sys->i_col, p_sys->i_row );