summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-02-14 14:50:34 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-02-14 14:50:34 +0000
commitc1a683ad8c2140dc32cd452bd75687852e6bf9a6 (patch)
tree72ed81c190b79c669f1e1134a3012cfb4a2f709f /libmpdemux
parent1b2d30c2212a158032b0c02dd942e7fad1adf55c (diff)
downloadmpv-c1a683ad8c2140dc32cd452bd75687852e6bf9a6.tar.bz2
mpv-c1a683ad8c2140dc32cd452bd75687852e6bf9a6.tar.xz
Change force_fps and force_ofps to double
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25997 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_nemesi.c2
-rw-r--r--libmpdemux/demux_rtp_codec.cpp2
2 files changed, 2 insertions, 2 deletions
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);