RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-24 04:08:19 +00:00
Code Issues Releases Wiki Activity

Change force_fps and force_ofps to double

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25997 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2008-02-14 14:50:34 +00:00
parent 1b2d30c221
commit c1a683ad8c
7 changed files with 8 additions and 8 deletions

2
cfg-common.h
View File

@ -173,7 +173,7 @@
{"mc", &default_max_pts_correction, CONF_TYPE_FLOAT, CONF_RANGE, 0, 100, NULL}, {"mc", &default_max_pts_correction, CONF_TYPE_FLOAT, CONF_RANGE, 0, 100, NULL},
// force video/audio rate: // 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}, {"srate", &force_srate, CONF_TYPE_INT, CONF_RANGE, 1000, 8*48000, NULL},
{"channels", &audio_output_channels, CONF_TYPE_INT, CONF_RANGE, 1, 6, NULL}, {"channels", &audio_output_channels, CONF_TYPE_INT, CONF_RANGE, 1, 6, NULL},
{"format", &audio_output_format, CONF_TYPE_AFMT, 0, 0, 0, NULL}, {"format", &audio_output_format, CONF_TYPE_AFMT, 0, 0, 0, NULL},

2
cfg-mencoder.h
View File

@ -168,7 +168,7 @@ const m_option_t mencoder_opts[]={
// set output framerate - recommended for variable-FPS (ASF etc) files // set output framerate - recommended for variable-FPS (ASF etc) files
// and for 29.97FPS progressive MPEG2 streams // 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}, {"o", &out_filename, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
// limit number of skippable frames after a non-skipped one // limit number of skippable frames after a non-skipped one

2
libmpdemux/demux_nemesi.c
View File

@ -108,7 +108,7 @@ static void link_session_and_fetch_conf(Nemesi_DemuxerStreamData * ndsd,
rtp_session * sess, rtp_session * sess,
rtp_buff * buff, unsigned int * fps) rtp_buff * buff, unsigned int * fps)
{ {
extern float force_fps; extern double force_fps;
rtp_ssrc *ssrc = NULL; rtp_ssrc *ssrc = NULL;
rtp_frame * fr = &ndsd->first_pkt[stype]; rtp_frame * fr = &ndsd->first_pkt[stype];
rtp_buff trash_buff; rtp_buff trash_buff;

2
libmpdemux/demux_rtp_codec.cpp
View File

@ -327,7 +327,7 @@ static void needVideoFrameRate(demuxer_t* demuxer,
// figure out the frame rate by itself, so (unless the user specifies // figure out the frame rate by itself, so (unless the user specifies
// it manually, using "-fps") we figure it out ourselves here, using the // it manually, using "-fps") we figure it out ourselves here, using the
// presentation timestamps in successive packets, // 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; demux_stream_t* d_video = demuxer->video;
sh_video_t* sh_video = (sh_video_t*)(d_video->sh); sh_video_t* sh_video = (sh_video_t*)(d_video->sh);

4
mencoder.c
View File

@ -163,8 +163,8 @@ static float audio_delay=0.0;
static int ignore_start=0; static int ignore_start=0;
static int audio_density=2; static int audio_density=2;
float force_fps=0; double force_fps=0;
static float force_ofps=0; // set to 24 for inverse telecine static double force_ofps=0; // set to 24 for inverse telecine
static int skip_limit=-1; static int skip_limit=-1;
float playback_speed=1.0; float playback_speed=1.0;

2
mplayer.c
View File

@ -302,7 +302,7 @@ static int ignore_start=0;
static int softsleep=0; static int softsleep=0;
float force_fps=0; double force_fps=0;
static int force_srate=0; static int force_srate=0;
static int audio_output_format=-1; // AF_FORMAT_UNKNOWN static int audio_output_format=-1; // AF_FORMAT_UNKNOWN
int frame_dropping=0; // option 0=no drop 1= drop vo 2= drop decode int frame_dropping=0; // option 0=no drop 1= drop vo 2= drop decode

2
mplayer.h
View File

@ -22,7 +22,7 @@ extern char * font_name;
extern char * sub_font_name; extern char * sub_font_name;
extern float font_factor; extern float font_factor;
extern float movie_aspect; extern float movie_aspect;
extern float force_fps; extern double force_fps;
//extern char **sub_name; //extern char **sub_name;
extern float sub_delay; extern float sub_delay;