diff options
| author | melanson <melanson@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-09 16:21:32 +0000 |
|---|---|---|
| committer | melanson <melanson@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-09 16:21:32 +0000 |
| commit | 7880c0fd35c82003b303bbd093e3f27cd66ba7b0 (patch) | |
| tree | 489fcd45e36d7e9f3143e7db3febdd8ff4c26b15 /libmpdemux/demux_fli.c | |
| parent | ca7c4340b95d3e6a61da2b3fa8ee772119c28cc7 (diff) | |
| download | mpv-7880c0fd35c82003b303bbd093e3f27cd66ba7b0.tar.bz2 mpv-7880c0fd35c82003b303bbd093e3f27cd66ba7b0.tar.xz | |
committed corrected speed calculation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3402 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_fli.c')
| -rw-r--r-- | libmpdemux/demux_fli.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libmpdemux/demux_fli.c b/libmpdemux/demux_fli.c index 6a5afb4725..f459887c55 100644 --- a/libmpdemux/demux_fli.c +++ b/libmpdemux/demux_fli.c @@ -65,10 +65,6 @@ demuxer_t* demux_open_fli(demuxer_t* demuxer){ demuxer->movi_start = 128; 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); if ((magic_number != 0xAF11) && (magic_number != 0xAF12)) @@ -77,7 +73,6 @@ demuxer_t* demux_open_fli(demuxer_t* demuxer){ magic_number); return(NULL); } -#endif // fetch the number of frames 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); if (speed == 0) speed = 1; -#if 0 if (magic_number == 0xAF11) speed *= 1000/70; -#endif sh_video->fps = 1000 / speed; sh_video->frametime = 1/sh_video->fps; |