diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-08-17 06:14:12 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-08-17 06:14:12 +0000 |
commit | 9054d575950c6a70baba55bdb9e97f4a8a0adb24 (patch) | |
tree | c8cfd78be7a455e4a473e66cc870e4e18e9c79a6 /libmpdemux/demux_mf.c | |
parent | eeaa871baa17c65cc46e3db0e99db590ad542da4 (diff) | |
download | mpv-9054d575950c6a70baba55bdb9e97f4a8a0adb24.tar.bz2 mpv-9054d575950c6a70baba55bdb9e97f4a8a0adb24.tar.xz |
Set demuxer->filepos in mf demuxer, since the stream_tell fallback is not
usable. Fixes progress display in mencoder.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29530 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mf.c')
-rw-r--r-- | libmpdemux/demux_mf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpdemux/demux_mf.c b/libmpdemux/demux_mf.c index 102fbf2986..9320c544ff 100644 --- a/libmpdemux/demux_mf.c +++ b/libmpdemux/demux_mf.c @@ -41,7 +41,7 @@ static void demux_seek_mf(demuxer_t *demuxer,float rel_seek_secs,float audio_del 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 @@ static int demux_mf_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds){ } fclose( f ); - mf->curr_frame++; + demuxer->filepos=mf->curr_frame++; return 1; } @@ -126,7 +126,7 @@ static demuxer_t* demux_open_mf(demuxer_t* demuxer){ 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; |