[MPlayer-cvslog] CVS: main/libmpdemux tvi_v4l2.c,1.29,1.30

[Jindrich Makovicka CVS]

CVS change done by Jindrich Makovicka CVS

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

Modified Files:
	tvi_v4l2.c 
Log Message:
mode fps int vs. float woes

Index: tvi_v4l2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_v4l2.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- tvi_v4l2.c	19 Aug 2005 14:30:24 -0000	1.29
+++ tvi_v4l2.c	22 Aug 2005 20:04:42 -0000	1.30
@@ -556,7 +556,7 @@
 	priv->immediate_mode = 1;
 	return TVI_CONTROL_TRUE;
     case TVI_CONTROL_VID_GET_FPS:
-	*(float *)arg = priv->standard.frameperiod.denominator /
+	*(float *)arg = (float)priv->standard.frameperiod.denominator /
 	    priv->standard.frameperiod.numerator;
 	mp_msg(MSGT_TV, MSGL_V, "%s: get fps: %f\n", info.short_name,
 	       *(float *)arg);
@@ -1218,8 +1218,8 @@
 
     /* setup video parameters */
     if (!tv_param_noaudio) {
-	if (priv->video_buffer_size_max < 3.0*(priv->standard.frameperiod.denominator /
-					       priv->standard.frameperiod.numerator)
+	if (priv->video_buffer_size_max < (3*priv->standard.frameperiod.denominator) /
+					       priv->standard.frameperiod.numerator
 	    *priv->audio_secs_per_block) {
 	    mp_msg(MSGT_TV, MSGL_ERR, "Video buffer shorter than 3 times audio frame duration.\n"
 		   "You will probably experience heavy framedrops.\n");