[Mplayer-cvslog] CVS: main/libmpdemux tv.c,1.16,1.17

Alex Beregszaszi alex at mplayer.dev.hu
Mon Dec 3 17:49:44 CET 2001


Update of /cvsroot/mplayer/main/libmpdemux
In directory mplayer:/var/tmp.root/cvs-serv32259

Modified Files:
	tv.c 
Log Message:
add tv fps support

Index: tv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tv.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- tv.c	3 Dec 2001 16:38:40 -0000	1.16
+++ tv.c	3 Dec 2001 16:49:41 -0000	1.17
@@ -44,7 +44,7 @@
 int tv_param_height = -1;
 int tv_param_input = 0; /* used in v4l and bttv */
 char *tv_param_outfmt = "yv12";
-
+float tv_param_fps = -1.0;
 
 /* ================== DEMUX_TV ===================== */
 /*
@@ -251,7 +251,9 @@
     {
 	if (funcs->control(tvh->priv, TVI_CONTROL_VID_GET_FPS, &sh_video->fps) != TVI_CONTROL_TRUE)
 	    sh_video->fps = 25.0f; /* on PAL */
-    }
+    }    
+    if (tv_param_fps != -1.0f)
+	sh_video->fps = tv_param_fps;
     sh_video->frametime = 1.0f/sh_video->fps;
 
     /* set width */




More information about the MPlayer-cvslog mailing list