summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-01-27 20:10:28 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-01-27 20:10:28 +0000
commita84d0c2628b6ae59e8f9aafad19dff057f6e65d0 (patch)
tree7c9e019bbc8889ea9d53358c1b379bb75b6925bc /libmpdemux
parent35201ca2957435a8ab11cb7091c5952d898d5a17 (diff)
downloadmpv-a84d0c2628b6ae59e8f9aafad19dff057f6e65d0.tar.bz2
mpv-a84d0c2628b6ae59e8f9aafad19dff057f6e65d0.tar.xz
DVD start position handling changed (progbar/eta fix)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4392 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_mpg.c5
-rw-r--r--libmpdemux/demuxer.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c
index 95fa6168f0..0e2dc257ee 100644
--- a/libmpdemux/demux_mpg.c
+++ b/libmpdemux/demux_mpg.c
@@ -349,7 +349,10 @@ void demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,int flags){
newpos+=sh_video->i_bps*rel_seek_secs;
}
- if(newpos<demuxer->movi_start) newpos=demuxer->movi_start;
+ if(newpos<demuxer->movi_start){
+ if(demuxer->stream->type!=STREAMTYPE_VCD) demuxer->movi_start=0; // for VCD
+ if(newpos<demuxer->movi_start) newpos=demuxer->movi_start;
+ }
#ifdef _LARGEFILE_SOURCE
newpos&=~((long long)STREAM_BUFFER_SIZE-1); /* sector boundary */
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 646dfa4544..4e3131d053 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -642,7 +642,7 @@ switch(file_format){
}
case DEMUXER_TYPE_MPEG_PS: {
sh_video=d_video->sh;sh_video->ds=d_video;
- if(demuxer->stream->type!=STREAMTYPE_VCD) demuxer->movi_start=0; // for VCD
+// if(demuxer->stream->type!=STREAMTYPE_VCD) demuxer->movi_start=0; // for VCD
if(audio_id!=-2) {
if(!ds_fill_buffer(d_audio)){