RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
reimar 2009-08-17 06:14:12 +00:00
parent eeaa871baa
commit 9054d57595
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libmpdemux/demux_mf.c
View File

@ -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; else newpos+=rel_seek_secs * sh_video->fps;
if ( newpos < 0 ) newpos=0; if ( newpos < 0 ) newpos=0;
if( newpos >= mf->nr_of_files) newpos=mf->nr_of_files - 1; if( newpos >= mf->nr_of_files) newpos=mf->nr_of_files - 1;
mf->curr_frame=newpos; demuxer->filepos=mf->curr_frame=newpos;
} }
// return value: // return value:
@ -71,7 +71,7 @@ static int demux_mf_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds){
} }
fclose( f ); fclose( f );
mf->curr_frame++; demuxer->filepos=mf->curr_frame++;
return 1; 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); 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_start = 0;
demuxer->movi_end = mf->nr_of_files - 1; demuxer->movi_end = mf->nr_of_files - 1;