[Mplayer-cvslog] CVS: main/libmpdemux demux_fli.c,1.5,1.6

[Mike Melanson]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mplayer:/var/tmp.root/cvs-serv4996/libmpdemux

Modified Files:
	demux_fli.c 
Log Message:
committed corrected speed calculation


Index: demux_fli.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_fli.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- demux_fli.c	30 Nov 2001 20:50:08 -0000	1.5
+++ demux_fli.c	9 Dec 2001 16:21:32 -0000	1.6
@@ -65,10 +65,6 @@
   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 @@
 	magic_number);
     return(NULL);    
   }
-#endif
 
   // fetch the number of frames
   frames->num_frames = stream_read_word_le(demuxer->stream);
@@ -112,10 +107,8 @@
   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;