mirror of
https://github.com/mpv-player/mpv
synced 2025-01-11 17:39:38 +00:00
committed corrected speed calculation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3402 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
ca7c4340b9
commit
7880c0fd35
@ -65,10 +65,6 @@ demuxer_t* demux_open_fli(demuxer_t* demuxer){
|
|||||||
demuxer->movi_start = 128;
|
demuxer->movi_start = 128;
|
||||||
demuxer->movi_end = stream_read_dword_le(demuxer->stream);
|
demuxer->movi_end = stream_read_dword_le(demuxer->stream);
|
||||||
|
|
||||||
#if 0
|
|
||||||
// skip the magic number
|
|
||||||
stream_skip(demuxer->stream, 2);
|
|
||||||
#else
|
|
||||||
magic_number = stream_read_word_le(demuxer->stream);
|
magic_number = stream_read_word_le(demuxer->stream);
|
||||||
|
|
||||||
if ((magic_number != 0xAF11) && (magic_number != 0xAF12))
|
if ((magic_number != 0xAF11) && (magic_number != 0xAF12))
|
||||||
@ -77,7 +73,6 @@ demuxer_t* demux_open_fli(demuxer_t* demuxer){
|
|||||||
magic_number);
|
magic_number);
|
||||||
return(NULL);
|
return(NULL);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
// fetch the number of frames
|
// fetch the number of frames
|
||||||
frames->num_frames = stream_read_word_le(demuxer->stream);
|
frames->num_frames = stream_read_word_le(demuxer->stream);
|
||||||
@ -112,10 +107,8 @@ demuxer_t* demux_open_fli(demuxer_t* demuxer){
|
|||||||
speed = stream_read_word_le(demuxer->stream);
|
speed = stream_read_word_le(demuxer->stream);
|
||||||
if (speed == 0)
|
if (speed == 0)
|
||||||
speed = 1;
|
speed = 1;
|
||||||
#if 0
|
|
||||||
if (magic_number == 0xAF11)
|
if (magic_number == 0xAF11)
|
||||||
speed *= 1000/70;
|
speed *= 1000/70;
|
||||||
#endif
|
|
||||||
sh_video->fps = 1000 / speed;
|
sh_video->fps = 1000 / speed;
|
||||||
sh_video->frametime = 1/sh_video->fps;
|
sh_video->frametime = 1/sh_video->fps;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user