Mercurial > mplayer.hg

diff libmpdemux/demux_mf.c @ 25883:baf32110d3fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use defines to give names to the different seek flags. A better solution should be considered later, esp. for the many broken demuxers that do not treat these flags correctly.
author reimar
date Tue, 29 Jan 2008 15:11:38 +0000
parents d4fe6e23283e
children 354ad909efcf
line wrap: on
line diff
--- a/libmpdemux/demux_mf.c	Tue Jan 29 14:58:10 2008 +0000
+++ b/libmpdemux/demux_mf.c	Tue Jan 29 15:11:38 2008 +0000
@@ -18,9 +18,9 @@
 static void demux_seek_mf(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){
   mf_t * mf = (mf_t *)demuxer->priv;
   sh_video_t   * sh_video = demuxer->video->sh;
-  int newpos = (flags & 1)?0:mf->curr_frame - 1;
+  int newpos = (flags & SEEK_ABSOLUTE)?0:mf->curr_frame - 1;
   
-  if ( flags & 2 ) newpos+=rel_seek_secs*(mf->nr_of_files - 1);
+  if ( flags & SEEK_FACTOR ) newpos+=rel_seek_secs*(mf->nr_of_files - 1);
    else newpos+=rel_seek_secs * sh_video->fps;
   if ( newpos < 0 ) newpos=0;
   if( newpos >= mf->nr_of_files) newpos=mf->nr_of_files - 1;