[Mplayer-cvslog] CVS: main/libmpdemux tvi_bsdbt848.c,1.11,1.12

[Alex Beregszaszi]

CVS change done by Alex Beregszaszi

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

Modified Files:
	tvi_bsdbt848.c 
Log Message:
correct typeconversion of fps, patches by several ppl

Index: tvi_bsdbt848.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_bsdbt848.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tvi_bsdbt848.c	2 Jan 2004 14:24:45 -0000	1.11
+++ tvi_bsdbt848.c	6 Apr 2004 12:19:40 -0000	1.12
@@ -293,6 +293,7 @@
     case TVI_CONTROL_TUN_SET_NORM:
         {
         int req_mode = (int)*(void **)arg;
+	u_short tmp_fps;
 
         priv->iformat = METEOR_FMT_AUTOMODE;
 
@@ -357,7 +358,8 @@
             return(0);
             }
 
-        if(ioctl(priv->btfd, METEORSFPS, &priv->fps) < 0) 
+	tmp_fps = priv->fps;
+        if(ioctl(priv->btfd, METEORSFPS, &tmp_fps) < 0) 
             {
             perror("fps:ioctl");
             return(0);
@@ -466,6 +468,7 @@
 {
 int marg;
 int count;
+u_short tmp_fps;
 
 G_private = priv; /* Oooh, sick */
 
@@ -510,8 +513,9 @@
     perror("SINPUT:ioctl");
     }
 
+tmp_fps = priv->fps;
 if(priv->videoready == TRUE &&
-   ioctl(priv->btfd, METEORSFPS, &priv->fps) < 0) 
+   ioctl(priv->btfd, METEORSFPS, &tmp_fps) < 0) 
     {
     perror("SFPS:ioctl");
     }