[Mplayer-cvslog] CVS: main/libmpdemux tv.c,1.55,1.56 tvi_v4l.c,1.62,1.63 tvi_bsdbt848.c,1.6,1.7

[Richard Felker CVS]

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

Modified Files:
	tv.c tvi_v4l.c tvi_bsdbt848.c 
Log Message:
1000000000l
default fps has been broken on ntsc for a LONG time because of this
nonsense! (29.00?!?) no idea why no one caught it, i just have
fps=29.97 in my config file... i hope the bsd code works; i can't test
it. btw, the (int)*(void **)arg stuff is total nonsense, no idea how
that even works...


Index: tv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tv.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- tv.c	28 Apr 2003 16:11:42 -0000	1.55
+++ tv.c	29 Apr 2003 02:23:47 -0000	1.56
@@ -449,7 +449,7 @@
 
     if(!sh_video->fps)
     {
-        int tmp;
+        float tmp;
         if (funcs->control(tvh->priv, TVI_CONTROL_VID_GET_FPS, &tmp) != TVI_CONTROL_TRUE)
              sh_video->fps = 25.0f; /* on PAL */
         else sh_video->fps = tmp;

Index: tvi_v4l.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_v4l.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- tvi_v4l.c	30 Mar 2003 17:05:58 -0000	1.62
+++ tvi_v4l.c	29 Apr 2003 02:23:47 -0000	1.63
@@ -81,7 +81,7 @@
     int				width;
     int				height;
     int				bytesperline;
-    int				fps;
+    float			fps;
 
     struct video_mbuf		mbuf;
     unsigned char               *mmap;
@@ -1072,7 +1072,7 @@
 	    control(priv, TVI_CONTROL_VID_SET_PICTURE, 0);
 	    return(TVI_CONTROL_TRUE);
 	case TVI_CONTROL_VID_GET_FPS:
-	    (int)*(void **)arg=priv->fps;
+	    *(float *)arg=priv->fps;
 	    return(TVI_CONTROL_TRUE);
 
 	/* ========== TUNER controls =========== */

Index: tvi_bsdbt848.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_bsdbt848.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tvi_bsdbt848.c	14 Jan 2003 18:20:17 -0000	1.6
+++ tvi_bsdbt848.c	29 Apr 2003 02:23:47 -0000	1.7
@@ -93,8 +93,8 @@
     int videoready;
     int btfd;
     int source;
-    int maxfps;
-    int fps;
+    float maxfps;
+    float fps;
     int iformat;
     int maxheight;
     int maxwidth;
@@ -419,7 +419,7 @@
         return(TVI_CONTROL_TRUE);        
 
     case TVI_CONTROL_VID_GET_FPS:
-        (int)*(void **)arg = (int)priv->fps;
+        *(float *)arg = priv->fps;
         return(TVI_CONTROL_TRUE);        
 
 /*