From eb0a6969bf5d2c7326a22b830f4d039759a06e12 Mon Sep 17 00:00:00 2001
From: rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 29 Apr 2003 02:23:47 +0000
Subject: 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...

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10020 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpdemux/tv.c           | 2 +-
 libmpdemux/tvi_bsdbt848.c | 6 +++---
 libmpdemux/tvi_v4l.c      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'libmpdemux')

diff --git a/libmpdemux/tv.c b/libmpdemux/tv.c
index 9c0450cbc8..711ccb3d4e 100644
--- a/libmpdemux/tv.c
+++ b/libmpdemux/tv.c
@@ -449,7 +449,7 @@ int demux_open_tv(demuxer_t *demuxer)
 
     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 --git a/libmpdemux/tvi_bsdbt848.c b/libmpdemux/tvi_bsdbt848.c
index 5460b4750c..6b1d01750a 100644
--- a/libmpdemux/tvi_bsdbt848.c
+++ b/libmpdemux/tvi_bsdbt848.c
@@ -93,8 +93,8 @@ typedef struct {
     int videoready;
     int btfd;
     int source;
-    int maxfps;
-    int fps;
+    float maxfps;
+    float fps;
     int iformat;
     int maxheight;
     int maxwidth;
@@ -419,7 +419,7 @@ static int control(priv_t *priv, int cmd, void *arg)
         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 --git a/libmpdemux/tvi_v4l.c b/libmpdemux/tvi_v4l.c
index 967f65c1f7..f2f14aad8f 100644
--- a/libmpdemux/tvi_v4l.c
+++ b/libmpdemux/tvi_v4l.c
@@ -81,7 +81,7 @@ typedef struct {
     int				width;
     int				height;
     int				bytesperline;
-    int				fps;
+    float			fps;
 
     struct video_mbuf		mbuf;
     unsigned char               *mmap;
@@ -1072,7 +1072,7 @@ static int control(priv_t *priv, int cmd, void *arg)
 	    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 =========== */
-- 
cgit v1.2.3