summaryrefslogtreecommitdiff
path: root/multimedia/mplayer/files/patch-demux-tvi_bsdbt848.c
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/mplayer/files/patch-demux-tvi_bsdbt848.c')
-rw-r--r--multimedia/mplayer/files/patch-demux-tvi_bsdbt848.c38
1 files changed, 36 insertions, 2 deletions
diff --git a/multimedia/mplayer/files/patch-demux-tvi_bsdbt848.c b/multimedia/mplayer/files/patch-demux-tvi_bsdbt848.c
index e106acaec16e..39128a408536 100644
--- a/multimedia/mplayer/files/patch-demux-tvi_bsdbt848.c
+++ b/multimedia/mplayer/files/patch-demux-tvi_bsdbt848.c
@@ -1,5 +1,5 @@
--- libmpdemux/tvi_bsdbt848.c.orig Mon Jun 2 00:30:37 2003
-+++ libmpdemux/tvi_bsdbt848.c Tue Dec 16 00:55:43 2003
++++ libmpdemux/tvi_bsdbt848.c Sun Jan 18 21:26:15 2004
@@ -39,8 +39,12 @@
#include <signal.h>
#include <string.h>
@@ -13,7 +13,22 @@
#else
#include <machine/ioctl_meteor.h>
#include <machine/ioctl_bt848.h>
-@@ -357,6 +361,12 @@
+@@ -287,6 +291,7 @@
+
+ case TVI_CONTROL_TUN_SET_NORM:
+ {
++ u_short tmp_fps;
+ int req_mode = (int)*(void **)arg;
+
+ priv->iformat = METEOR_FMT_AUTOMODE;
+@@ -352,11 +357,18 @@
+ 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);
}
@@ -26,3 +41,22 @@
return(TVI_CONTROL_TRUE);
}
+@@ -453,6 +465,7 @@
+ {
+ int marg;
+ int count;
++u_short tmp_fps;
+
+ G_private = priv; /* Oooh, sick */
+
+@@ -497,8 +510,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");
+ }