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_audio.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_audio.c')
-rw-r--r-- | libmpdemux/demux_audio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c index 9449836246..fa86b1d242 100644 --- a/libmpdemux/demux_audio.c +++ b/libmpdemux/demux_audio.c @@ -646,8 +646,8 @@ static void demux_audio_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_ s = demuxer->stream; priv = demuxer->priv; - if(priv->frmt == MP3 && hr_mp3_seek && !(flags & 2)) { - len = (flags & 1) ? rel_seek_secs - priv->next_pts : rel_seek_secs; + if(priv->frmt == MP3 && hr_mp3_seek && !(flags & SEEK_FACTOR)) { + len = (flags & SEEK_ABSOLUTE) ? rel_seek_secs - priv->next_pts : rel_seek_secs; if(len < 0) { stream_seek(s,demuxer->movi_start); len = priv->next_pts + len; @@ -658,8 +658,8 @@ static void demux_audio_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_ return; } - base = flags&1 ? demuxer->movi_start : stream_tell(s); - if(flags&2) + base = flags&SEEK_ABSOLUTE ? demuxer->movi_start : stream_tell(s); + if(flags&SEEK_FACTOR) pos = base + ((demuxer->movi_end - demuxer->movi_start)*rel_seek_secs); else pos = base + (rel_seek_secs*sh_audio->i_bps); |