Mercurial > mplayer.hg

changeset 12139:e34f9638aa51

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
correct typeconversion of fps, patches by several ppl
author alex
date Tue, 06 Apr 2004 12:19:40 +0000
parents eb3ad04675e1
children 9eed12b9b242
files libmpdemux/tvi_bsdbt848.c
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/tvi_bsdbt848.c	Tue Apr 06 11:52:31 2004 +0000
+++ b/libmpdemux/tvi_bsdbt848.c	Tue Apr 06 12:19:40 2004 +0000
@@ -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");
     }