From c1a683ad8c2140dc32cd452bd75687852e6bf9a6 Mon Sep 17 00:00:00 2001 From: reimar Date: Thu, 14 Feb 2008 14:50:34 +0000 Subject: [PATCH] Change force_fps and force_ofps to double git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25997 b3059339-0415-0410-9bf9-f77b7e298cf2 --- cfg-common.h | 2 +- cfg-mencoder.h | 2 +- libmpdemux/demux_nemesi.c | 2 +- libmpdemux/demux_rtp_codec.cpp | 2 +- mencoder.c | 4 ++-- mplayer.c | 2 +- mplayer.h | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cfg-common.h b/cfg-common.h index 5eb8cb77d7..9b8fd89df5 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -173,7 +173,7 @@ {"mc", &default_max_pts_correction, CONF_TYPE_FLOAT, CONF_RANGE, 0, 100, NULL}, // force video/audio rate: - {"fps", &force_fps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0, NULL}, + {"fps", &force_fps, CONF_TYPE_DOUBLE, CONF_MIN, 0, 0, NULL}, {"srate", &force_srate, CONF_TYPE_INT, CONF_RANGE, 1000, 8*48000, NULL}, {"channels", &audio_output_channels, CONF_TYPE_INT, CONF_RANGE, 1, 6, NULL}, {"format", &audio_output_format, CONF_TYPE_AFMT, 0, 0, 0, NULL}, diff --git a/cfg-mencoder.h b/cfg-mencoder.h index b933bdfcb0..aebfc74825 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -168,7 +168,7 @@ const m_option_t mencoder_opts[]={ // set output framerate - recommended for variable-FPS (ASF etc) files // and for 29.97FPS progressive MPEG2 streams - {"ofps", &force_ofps, CONF_TYPE_FLOAT, CONF_MIN|CONF_GLOBAL, 0, 0, NULL}, + {"ofps", &force_ofps, CONF_TYPE_DOUBLE, CONF_MIN|CONF_GLOBAL, 0, 0, NULL}, {"o", &out_filename, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, // limit number of skippable frames after a non-skipped one diff --git a/libmpdemux/demux_nemesi.c b/libmpdemux/demux_nemesi.c index b84c63b486..d0669631a6 100644 --- a/libmpdemux/demux_nemesi.c +++ b/libmpdemux/demux_nemesi.c @@ -108,7 +108,7 @@ static void link_session_and_fetch_conf(Nemesi_DemuxerStreamData * ndsd, rtp_session * sess, rtp_buff * buff, unsigned int * fps) { - extern float force_fps; + extern double force_fps; rtp_ssrc *ssrc = NULL; rtp_frame * fr = &ndsd->first_pkt[stype]; rtp_buff trash_buff; diff --git a/libmpdemux/demux_rtp_codec.cpp b/libmpdemux/demux_rtp_codec.cpp index 633a91e1d2..7f9174d6a0 100644 --- a/libmpdemux/demux_rtp_codec.cpp +++ b/libmpdemux/demux_rtp_codec.cpp @@ -327,7 +327,7 @@ static void needVideoFrameRate(demuxer_t* demuxer, // figure out the frame rate by itself, so (unless the user specifies // it manually, using "-fps") we figure it out ourselves here, using the // presentation timestamps in successive packets, - extern float force_fps; if (force_fps != 0.0) return; // user used "-fps" + extern double force_fps; if (force_fps != 0.0) return; // user used "-fps" demux_stream_t* d_video = demuxer->video; sh_video_t* sh_video = (sh_video_t*)(d_video->sh); diff --git a/mencoder.c b/mencoder.c index 8f9937dc28..37d9aa3844 100644 --- a/mencoder.c +++ b/mencoder.c @@ -163,8 +163,8 @@ static float audio_delay=0.0; static int ignore_start=0; static int audio_density=2; -float force_fps=0; -static float force_ofps=0; // set to 24 for inverse telecine +double force_fps=0; +static double force_ofps=0; // set to 24 for inverse telecine static int skip_limit=-1; float playback_speed=1.0; diff --git a/mplayer.c b/mplayer.c index cd0a903a25..8d78badef3 100644 --- a/mplayer.c +++ b/mplayer.c @@ -302,7 +302,7 @@ static int ignore_start=0; static int softsleep=0; - float force_fps=0; + double force_fps=0; static int force_srate=0; static int audio_output_format=-1; // AF_FORMAT_UNKNOWN int frame_dropping=0; // option 0=no drop 1= drop vo 2= drop decode diff --git a/mplayer.h b/mplayer.h index 90c2a53cd6..9811718140 100644 --- a/mplayer.h +++ b/mplayer.h @@ -22,7 +22,7 @@ extern char * font_name; extern char * sub_font_name; extern float font_factor; extern float movie_aspect; -extern float force_fps; +extern double force_fps; //extern char **sub_name; extern float sub_delay;