vlc/vlc-2.0 | branch: master | David Fuhrmann <[email protected]> |
Thu Dec 27 20:52:05 2012 +0100| [823041974db256f9b70e1d882bee9f41b92ae8af] |
committer: David Fuhrmann
puzzle: row and col values of 1 are not supported
(cherry picked from commit 05f9c0acdbf2832d507724d644d32aa06c47cf65)
Conflicts:
modules/video_filter/puzzle.c
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=823041974db256f9b70e1d882bee9f41b92ae8af
---
modules/video_filter/puzzle.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/video_filter/puzzle.c b/modules/video_filter/puzzle.c
index b9b6bf8..6062e7e 100644
--- a/modules/video_filter/puzzle.c
+++ b/modules/video_filter/puzzle.c
@@ -364,11 +364,11 @@ static int PuzzleCallback( vlc_object_t *p_this, char
const *psz_var,
vlc_mutex_lock( &p_sys->lock );
if( !strcmp( psz_var, CFG_PREFIX "rows" ) )
{
- p_sys->change.i_rows = __MAX( 1, newval.i_int );
+ p_sys->change.i_rows = __MAX( 2, newval.i_int );
}
else if( !strcmp( psz_var, CFG_PREFIX "cols" ) )
{
- p_sys->change.i_cols = __MAX( 1, newval.i_int );
+ p_sys->change.i_cols = __MAX( 2, newval.i_int );
}
else if( !strcmp( psz_var, CFG_PREFIX "black-slot" ) )
{
_______________________________________________
vlc-commits mailing list
[email protected]
http://mailman.videolan.org/listinfo/vlc-commits
