[MPlayer-cvslog] CVS: main/libmpdemux tv.c, 1.78, 1.79 tvi_v4l.c, 1.76, 1.77 tvi_v4l2.c, 1.37, 1.38

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv19703

Modified Files:
	tv.c tvi_v4l.c tvi_v4l2.c 
Log Message:
make failures during e.g. setting the TV norm non-fatal.
Makes some (crappy *g*) USB cameras work with MPlayer.


Index: tv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tv.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- tv.c	14 Mar 2006 00:45:06 -0000	1.78
+++ tv.c	11 Apr 2006 10:19:53 -0000	1.79
@@ -224,7 +224,6 @@
 	mp_msg(MSGT_TV, MSGL_V, "Selected norm id: %d\n", tv_param_normid);
 	if (funcs->control(tvh->priv, TVI_CONTROL_TUN_SET_NORM, &tv_param_normid) != TVI_CONTROL_TRUE) {
 	    mp_msg(MSGT_TV, MSGL_ERR, "Error: Cannot set norm!\n");
-	    return 0;
 	}
     } else {
 #endif
@@ -234,7 +233,6 @@
     mp_msg(MSGT_TV, MSGL_V, "Selected norm: %s\n", tv_param_norm);
     if (funcs->control(tvh->priv, TVI_CONTROL_TUN_SET_NORM, &tvh->norm) != TVI_CONTROL_TRUE) {
 	mp_msg(MSGT_TV, MSGL_ERR, "Error: Cannot set norm!\n");
-	return 0;
     }
 #ifdef HAVE_TV_V4L2
     }

Index: tvi_v4l.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_v4l.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- tvi_v4l.c	12 Jan 2006 20:04:34 -0000	1.76
+++ tvi_v4l.c	11 Apr 2006 10:19:53 -0000	1.77
@@ -799,7 +799,6 @@
     if (ioctl(priv->video_fd, VIDIOCSPICT, &priv->picture) == -1)
     {
 	mp_msg(MSGT_TV, MSGL_ERR, "ioctl set picture failed: %s\n", strerror(errno));
-	return(0);
     }
 
     if ( !tv_param_mjpeg )

Index: tvi_v4l2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_v4l2.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- tvi_v4l2.c	8 Mar 2006 00:21:44 -0000	1.37
+++ tvi_v4l2.c	11 Apr 2006 10:19:53 -0000	1.38
@@ -972,10 +972,11 @@
 	return 0;
     }
 
-    if (getfmt(priv) < 0 || getstd(priv) < 0) {
+    if (getfmt(priv) < 0) {
 	uninit(priv);
 	return 0;
     }
+    getstd(priv);
     /*
     ** if this device has got a tuner query it's settings
     ** otherwise set some nice defaults