diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-08-18 02:29:37 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-08-18 02:29:37 +0300 |
| commit | 95da34aa071d64b21ef3e952b987ba3dcee84ca0 (patch) | |
| tree | eabf4399e40fd270714c53d40688eadadfd4c5ff /mencoder.c | |
| parent | f394231f5de9d1ff679f1b2da4d1f1b303ae914a (diff) | |
| parent | 3961e12fca2f1ec10c64e3ff298828feecca52c9 (diff) | |
| download | mpv-95da34aa071d64b21ef3e952b987ba3dcee84ca0.tar.bz2 mpv-95da34aa071d64b21ef3e952b987ba3dcee84ca0.tar.xz | |
Merge svn changes up to r29532
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/mencoder.c b/mencoder.c index 47b0efb8a1..de862fac48 100644 --- a/mencoder.c +++ b/mencoder.c @@ -77,13 +77,8 @@ #include "stream/stream_dvd.h" #endif -#ifdef CONFIG_DVDNAV #include "stream/stream_dvdnav.h" -#endif - -#ifdef CONFIG_LIBAVCODEC #include "libavcodec/avcodec.h" -#endif #include "libmpcodecs/ae.h" #include "options.h" @@ -1419,7 +1414,8 @@ if(sh_audio && !demuxer2){ { float t=(GetTimerMS()-timer_start)*0.001f; float len=(demuxer->movi_end-demuxer->movi_start); - float p=len>1000 ? (float)(demuxer->filepos-demuxer->movi_start) / len : + off_t pos = demuxer->filepos >= 0 ? demuxer->filepos : stream_tell(demuxer->stream); + float p=len>1000 ? (float)(pos-demuxer->movi_start) / len : (demuxer_get_percent_pos(demuxer) / 100.0); #if 0 if(!len && sh_audio && sh_audio->audio.dwLength>100){ |