Mercurial > mplayer.hg

changeset 5797:c31ad722f491

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mostma' fix
author pontscho
date Tue, 23 Apr 2002 13:57:41 +0000
parents 7a4b18b787c0
children 89f20a0ff5cd
files mplayer.c
diffstat 1 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Tue Apr 23 13:27:46 2002 +0000
+++ b/mplayer.c	Tue Apr 23 13:57:41 2002 +0000
@@ -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 )