diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-01-29 15:11:38 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-01-29 15:11:38 +0000 |
commit | 5960ddb8e5c295145d989c223b3f0029095a2311 (patch) | |
tree | 96ac4fbfc59762228fbaf6a277e6442949b78362 /libmpdemux/demux_mpg.c | |
parent | da8ab92c7dfab98911c0ae25ba2e88e699f20300 (diff) | |
download | mpv-5960ddb8e5c295145d989c223b3f0029095a2311.tar.bz2 mpv-5960ddb8e5c295145d989c223b3f0029095a2311.tar.xz |
Use defines to give names to the different seek flags.
A better solution should be considered later, esp. for the many
broken demuxers that do not treat these flags correctly.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25911 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mpg.c')
-rw-r--r-- | libmpdemux/demux_mpg.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c index 39f73b0174..3ebec07a8e 100644 --- a/libmpdemux/demux_mpg.c +++ b/libmpdemux/demux_mpg.c @@ -893,14 +893,14 @@ void demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,float audio_delay, in float oldpts = 0; off_t oldpos = demuxer->filepos; float newpts = 0; - off_t newpos = (flags & 1) ? demuxer->movi_start : oldpos; + off_t newpos = (flags & SEEK_ABSOLUTE) ? demuxer->movi_start : oldpos; if(mpg_d) oldpts = mpg_d->last_pts; - newpts = (flags & 1) ? 0.0 : oldpts; + newpts = (flags & SEEK_ABSOLUTE) ? 0.0 : oldpts; //================= seek in MPEG ========================== //calculate the pts to seek to - if(flags & 2) { + if(flags & SEEK_FACTOR) { if (mpg_d && mpg_d->first_to_final_pts_len > 0.0) newpts += mpg_d->first_to_final_pts_len * rel_seek_secs; else @@ -909,7 +909,7 @@ void demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,float audio_delay, in newpts += rel_seek_secs; if (newpts < 0) newpts = 0; - if(flags&2){ + if(flags&SEEK_FACTOR){ // float seek 0..1 newpos+=(demuxer->movi_end-demuxer->movi_start)*rel_seek_secs; } else { |