From 7880c0fd35c82003b303bbd093e3f27cd66ba7b0 Mon Sep 17 00:00:00 2001
From: melanson <melanson@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 9 Dec 2001 16:21:32 +0000
Subject: committed corrected speed calculation

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3402 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpdemux/demux_fli.c | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'libmpdemux/demux_fli.c')

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;
 
-- 
cgit v1.2.3