[Mplayer-cvslog] CVS: main/libvo vo_zr2.c,1.2,1.3

[Rik Snel CVS]

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv13876

Modified Files:
	vo_zr2.c 
Log Message:
specification of video norm should not be mandatory

Index: vo_zr2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_zr2.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vo_zr2.c	8 Nov 2003 14:10:33 -0000	1.2
+++ vo_zr2.c	8 Nov 2003 16:08:33 -0000	1.3
@@ -241,8 +241,9 @@
 			normstring(p->zp.norm));
 
 	/* changing the norm in the zoran_params and MJPIOC_S_PARAMS
-	 * does noting, so bail out if the norm is not correct */
-	if (p->zp.norm != norm) {
+	 * does nothing the last time I tried, so bail out if the norm 
+	 * is not correct */
+	if (norm != VIDEO_MODE_AUTO &&  p->zp.norm != norm) {
 		ERROR("mplayer currently can't change the video norm, "
 				"change it with (eg.) XawTV and retry.\n");
 		uninit();