summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-04-06 12:19:40 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-04-06 12:19:40 +0000
commit716f3c90d8f7b3c8dd8fbf0b0d1352f5e4b80e4f (patch)
tree0a296f36b617cf6ec9ea30e0651bad270cc427cf /libmpdemux
parent928e11d1f1e19a08b976b29b97e52798fa78cc2b (diff)
downloadmpv-716f3c90d8f7b3c8dd8fbf0b0d1352f5e4b80e4f.tar.bz2
mpv-716f3c90d8f7b3c8dd8fbf0b0d1352f5e4b80e4f.tar.xz
correct typeconversion of fps, patches by several ppl
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12140 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/tvi_bsdbt848.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/libmpdemux/tvi_bsdbt848.c b/libmpdemux/tvi_bsdbt848.c
index e6640c218c..bf7bcb8384 100644
--- a/libmpdemux/tvi_bsdbt848.c
+++ b/libmpdemux/tvi_bsdbt848.c
@@ -293,6 +293,7 @@ static int control(priv_t *priv, int cmd, void *arg)
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 @@ static int control(priv_t *priv, int cmd, void *arg)
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 @@ static int init(priv_t *priv)
{
int marg;
int count;
+u_short tmp_fps;
G_private = priv; /* Oooh, sick */
@@ -510,8 +513,9 @@ if(priv->videoready == TRUE &&
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");
}