[Mplayer-cvslog] CVS: main/libmpdemux demux_mpg.c,1.38,1.39 demuxer.c,1.67,1.68

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mplayer:/var/tmp.root/cvs-serv17229

Modified Files:
	demux_mpg.c demuxer.c 
Log Message:
DVD start position handling changed (progbar/eta fix)

Index: demux_mpg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mpg.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- demux_mpg.c	4 Jan 2002 13:08:14 -0000	1.38
+++ demux_mpg.c	27 Jan 2002 20:10:28 -0000	1.39
@@ -349,7 +349,10 @@
           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 */

Index: demuxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- demuxer.c	17 Jan 2002 00:32:46 -0000	1.67
+++ demuxer.c	27 Jan 2002 20:10:28 -0000	1.68
@@ -642,7 +642,7 @@
  }
  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)){