From 1b2d30c2212a158032b0c02dd942e7fad1adf55c Mon Sep 17 00:00:00 2001 From: reimar Date: Thu, 14 Feb 2008 14:44:52 +0000 Subject: [PATCH] Change mf_fps to double git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25996 b3059339-0415-0410-9bf9-f77b7e298cf2 --- cfg-common.h | 4 ++-- libmpdemux/mf.c | 2 +- libmpdemux/mf.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cfg-common.h b/cfg-common.h index dbf3111be7..5eb8cb77d7 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -565,7 +565,7 @@ const m_option_t vivoopts_conf[]={ extern int mf_w; extern int mf_h; -extern float mf_fps; +extern double mf_fps; extern char * mf_type; extern m_obj_settings_t* vf_settings; extern m_obj_list_t vf_obj_list; @@ -574,7 +574,7 @@ const m_option_t mfopts_conf[]={ {"on", "-mf on has been removed, use mf:// instead.\n", CONF_TYPE_PRINT, 0, 0, 1, NULL}, {"w", &mf_w, CONF_TYPE_INT, 0, 0, 0, NULL}, {"h", &mf_h, CONF_TYPE_INT, 0, 0, 0, NULL}, - {"fps", &mf_fps, CONF_TYPE_FLOAT, 0, 0, 0, NULL}, + {"fps", &mf_fps, CONF_TYPE_DOUBLE, 0, 0, 0, NULL}, {"type", &mf_type, CONF_TYPE_STRING, 0, 0, 0, NULL}, {NULL, NULL, 0, 0, 0, 0, NULL} }; diff --git a/libmpdemux/mf.c b/libmpdemux/mf.c index f764a1d3da..4d19fdb43c 100644 --- a/libmpdemux/mf.c +++ b/libmpdemux/mf.c @@ -25,7 +25,7 @@ int mf_w = 0; //352; // let codecs to detect it int mf_h = 0; //288; -float mf_fps = 25.0; +double mf_fps = 25.0; char * mf_type = NULL; //"jpg"; mf_t* open_mf(char * filename){ diff --git a/libmpdemux/mf.h b/libmpdemux/mf.h index f49cac4ed7..1e58c7293d 100644 --- a/libmpdemux/mf.h +++ b/libmpdemux/mf.h @@ -4,7 +4,7 @@ extern int mf_w; extern int mf_h; -extern float mf_fps; +extern double mf_fps; extern char * mf_type; typedef struct