# HG changeset patch # User reimar # Date 1250489652 0 # Node ID 6f7e97c44353b868687c6dcf14b9d4d141ea4d03 # Parent 53ff77686a5cc07de98ff8b1237706ab2c3a2df5 Set demuxer->filepos in mf demuxer, since the stream_tell fallback is not usable. Fixes progress display in mencoder. diff -r 53ff77686a5c -r 6f7e97c44353 libmpdemux/demux_mf.c --- 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;