diff options
| author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-23 13:57:41 +0000 |
|---|---|---|
| committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-23 13:57:41 +0000 |
| commit | 6ee066c458bc88d9da0eb08fbb17292f8d2ac1a8 (patch) | |
| tree | 09809c727b4100c25508746d2bad668fbb3f8490 /mplayer.c | |
| parent | 8f44305b62efa5fcaa4df8f3f24534ed4f5befd3 (diff) | |
| download | mpv-6ee066c458bc88d9da0eb08fbb17292f8d2ac1a8.tar.bz2 mpv-6ee066c458bc88d9da0eb08fbb17292f8d2ac1a8.tar.xz | |
mostma' fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5798 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
| -rw-r--r-- | mplayer.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -2218,9 +2218,8 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still) 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 @@ if(rel_seek_secs || abs_seek_pos){ 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 ) |