# HG changeset patch
# User rfelker
# Date 1051583027 0
# Node ID 0ea7b9c6c27fd995350ac80a5bfef180190ea79d
# Parent  a0bfc974f50456b5968eeff619b72ec0bb8fda69
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...

diff -r a0bfc974f504 -r 0ea7b9c6c27f libmpdemux/tv.c
--- a/libmpdemux/tv.c	Tue Apr 29 02:02:26 2003 +0000
+++ b/libmpdemux/tv.c	Tue Apr 29 02:23:47 2003 +0000
@@ -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;
diff -r a0bfc974f504 -r 0ea7b9c6c27f libmpdemux/tvi_bsdbt848.c
--- a/libmpdemux/tvi_bsdbt848.c	Tue Apr 29 02:02:26 2003 +0000
+++ b/libmpdemux/tvi_bsdbt848.c	Tue Apr 29 02:23:47 2003 +0000
@@ -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);        
 
 /*
diff -r a0bfc974f504 -r 0ea7b9c6c27f libmpdemux/tvi_v4l.c
--- a/libmpdemux/tvi_v4l.c	Tue Apr 29 02:02:26 2003 +0000
+++ b/libmpdemux/tvi_v4l.c	Tue Apr 29 02:23:47 2003 +0000
@@ -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 =========== */