[Mplayer-cvslog] CVS: 0_90/libmpdemux tv.c,1.49,1.50 tvi_bsdbt848.c,1.6,1.7 tvi_v4l.c,1.54,1.55

[Dominik Mierzejewski CVS]

Update of /cvsroot/mplayer/0_90/libmpdemux
In directory mail:/var/tmp.root/cvs-serv9706

Modified Files:
	tv.c tvi_bsdbt848.c tvi_v4l.c 
Log Message:
Backport Richard's 1000000000l fix:
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/0_90/libmpdemux/tv.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- tv.c	10 Mar 2003 16:00:39 -0000	1.49
+++ tv.c	1 May 2003 14:57:02 -0000	1.50
@@ -390,7 +390,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_bsdbt848.c
===================================================================
RCS file: /cvsroot/mplayer/0_90/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	1 May 2003 14:57:02 -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);        
 
 /*

Index: tvi_v4l.c
===================================================================
RCS file: /cvsroot/mplayer/0_90/libmpdemux/tvi_v4l.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- tvi_v4l.c	2 Feb 2003 02:36:35 -0000	1.54
+++ tvi_v4l.c	1 May 2003 14:57:02 -0000	1.55
@@ -76,7 +76,7 @@
     int				width;
     int				height;
     int				bytesperline;
-    int				fps;
+    float			fps;
 
     struct video_mbuf		mbuf;
     unsigned char               *mmap;
@@ -918,7 +918,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 =========== */