[Mplayer-cvslog] CVS: main mplayer.c,1.479,1.480

Zoltan Ponekker pontscho at mplayerhq.hu
Tue Apr 23 15:57:55 CEST 2002


Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv28156

Modified Files:
	mplayer.c 
Log Message:
mostma' fix

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.479
retrieving revision 1.480
diff -u -r1.479 -r1.480
--- mplayer.c	23 Apr 2002 13:26:56 -0000	1.479
+++ mplayer.c	23 Apr 2002 13:57:41 -0000	1.480
@@ -2218,9 +2218,8 @@
       abs = (cmd->nargs > 1) ? cmd->args[1].v.i : 0;
       if(abs) {
 	abs_seek_pos = 3;
-	if(sh_video)
-	  osd_function= (v > sh_video->timer) ? OSD_FFW : OSD_REW;
-	rel_seek_secs = v/100.0;
+	osd_function= (v > sh_video->timer) ? OSD_FFW : OSD_REW;
+	rel_seek_secs = v;
       }
       else {
 	rel_seek_secs+= v;
@@ -2744,8 +2743,8 @@
 	  int pos=(demuxer->file_format==DEMUXER_TYPE_AVI)?demuxer->filepos:d_video->pos;
 	  guiIntfStruct.Position=(len<=0)?0:((float)(pos-demuxer->movi_start) / len * 100.0f);
 	}
-	if ( demuxer->file_format==DEMUXER_TYPE_AUDIO ) guiIntfStruct.TimeSec=sh_audio->timer;
-	  else guiIntfStruct.TimeSec=d_video->pts; 
+	if ( sh_video ) guiIntfStruct.TimeSec=d_video->pts;
+	  else if ( sh_audio ) guiIntfStruct.TimeSec=sh_audio->timer;
 	if(guiIntfStruct.Playing==0) break; // STOP
 	if(guiIntfStruct.Playing==2) osd_function=OSD_PAUSE;
 	if ( guiIntfStruct.VolumeChanged ) 




More information about the MPlayer-cvslog mailing list