diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-03 16:49:55 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-03 16:49:55 +0000 |
| commit | 08fa1f628dbbd0a06116b4057f271bd232e44690 (patch) | |
| tree | 29a85a7bb79aacb5a1d2ac2221b853bd09052a1a /libmpdemux | |
| parent | 1b902e0a669fb109962f8d13801d9fca80e21760 (diff) | |
| download | mpv-08fa1f628dbbd0a06116b4057f271bd232e44690.tar.bz2 mpv-08fa1f628dbbd0a06116b4057f271bd232e44690.tar.xz | |
add tv fps support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3286 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/tv.c | 6 | ||||
| -rw-r--r-- | libmpdemux/tv.h | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libmpdemux/tv.c b/libmpdemux/tv.c index 192fc09092..8a7e191427 100644 --- a/libmpdemux/tv.c +++ b/libmpdemux/tv.c @@ -44,7 +44,7 @@ int tv_param_width = -1; 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 @@ int demux_open_tv(demuxer_t *demuxer, tvi_handle_t *tvh) { 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 */ diff --git a/libmpdemux/tv.h b/libmpdemux/tv.h index 8fa0e596f3..adfb6189f5 100644 --- a/libmpdemux/tv.h +++ b/libmpdemux/tv.h @@ -19,6 +19,7 @@ extern int tv_param_width; extern int tv_param_height; extern int tv_param_input; extern char *tv_param_outfmt; +extern float tv_param_fps; typedef struct tvi_info_s { |