Mercurial > mplayer.hg

changeset 29488:6f7e97c44353

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Set demuxer->filepos in mf demuxer, since the stream_tell fallback is not usable. Fixes progress display in mencoder.
author reimar
date Mon, 17 Aug 2009 06:14:12 +0000
parents 53ff77686a5c
children 228b323e90a7
files libmpdemux/demux_mf.c
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_mf.c	Mon Aug 17 05:56:36 2009 +0000
+++ b/libmpdemux/demux_mf.c	Mon Aug 17 06:14:12 2009 +0000
@@ -41,7 +41,7 @@
    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;
-  mf->curr_frame=newpos;
+  demuxer->filepos=mf->curr_frame=newpos;
 }
 
 // return value:
@@ -71,7 +71,7 @@
   }
   fclose( f );
 
-  mf->curr_frame++;
+  demuxer->filepos=mf->curr_frame++;
   return 1;
 }
 
@@ -126,7 +126,7 @@
     mp_msg(MSGT_DEMUX, MSGL_INFO, "[demux_mf] file type was not set! trying 'type=%s'...\n", mf_type);
   }
 
-  mf->curr_frame=0;
+  demuxer->filepos=mf->curr_frame=0;
 
   demuxer->movi_start = 0;
   demuxer->movi_end = mf->nr_of_files - 1;