Mercurial > mplayer.hg
changeset 25965:4cd12675cfbb
Change force_fps and force_ofps to double
| author | reimar |
|---|---|
| date | Thu, 14 Feb 2008 14:50:34 +0000 |
| parents | cb07fc632de1 |
| children | 28316f2f8d26 |
| files | cfg-common.h cfg-mencoder.h libmpdemux/demux_nemesi.c libmpdemux/demux_rtp_codec.cpp mencoder.c mplayer.c mplayer.h |
| diffstat | 7 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/cfg-common.h Thu Feb 14 14:44:52 2008 +0000 +++ b/cfg-common.h Thu Feb 14 14:50:34 2008 +0000 @@ -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},
--- a/cfg-mencoder.h Thu Feb 14 14:44:52 2008 +0000 +++ b/cfg-mencoder.h Thu Feb 14 14:50:34 2008 +0000 @@ -168,7 +168,7 @@ // 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
--- a/libmpdemux/demux_nemesi.c Thu Feb 14 14:44:52 2008 +0000 +++ b/libmpdemux/demux_nemesi.c Thu Feb 14 14:50:34 2008 +0000 @@ -108,7 +108,7 @@ 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;
--- a/libmpdemux/demux_rtp_codec.cpp Thu Feb 14 14:44:52 2008 +0000 +++ b/libmpdemux/demux_rtp_codec.cpp Thu Feb 14 14:50:34 2008 +0000 @@ -327,7 +327,7 @@ // 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);
--- a/mencoder.c Thu Feb 14 14:44:52 2008 +0000 +++ b/mencoder.c Thu Feb 14 14:50:34 2008 +0000 @@ -163,8 +163,8 @@ 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;
--- a/mplayer.c Thu Feb 14 14:44:52 2008 +0000 +++ b/mplayer.c Thu Feb 14 14:50:34 2008 +0000 @@ -302,7 +302,7 @@ 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