Mercurial > mplayer.hg

diff libmpdemux/demux_fli.c @ 3401:85feae032869

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
committed corrected speed calculation
author melanson
date Sun, 09 Dec 2001 16:21:32 +0000
parents 7eefc6e4f6d4
children 61b89c10e4e8
line wrap: on
line diff
--- a/libmpdemux/demux_fli.c	Sun Dec 09 16:20:03 2001 +0000
+++ b/libmpdemux/demux_fli.c	Sun Dec 09 16:21:32 2001 +0000
@@ -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;