summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_ogg.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-01-29 15:11:38 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-01-29 15:11:38 +0000
commit5960ddb8e5c295145d989c223b3f0029095a2311 (patch)
tree96ac4fbfc59762228fbaf6a277e6442949b78362 /libmpdemux/demux_ogg.c
parentda8ab92c7dfab98911c0ae25ba2e88e699f20300 (diff)
downloadmpv-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_ogg.c')
-rw-r--r--libmpdemux/demux_ogg.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c
index 9cde771a1b..717f3ccd8d 100644
--- a/libmpdemux/demux_ogg.c
+++ b/libmpdemux/demux_ogg.c
@@ -1366,8 +1366,8 @@ static void demux_ogg_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_de
old_pos = ogg_d->pos;
//calculate the granulepos to seek to
- gp = flags & 1 ? 0 : os->lastpos;
- if(flags & 2) {
+ gp = flags & SEEK_ABSOLUTE ? 0 : os->lastpos;
+ if(flags & SEEK_FACTOR) {
if (ogg_d->final_granulepos > 0)
gp += ogg_d->final_granulepos * rel_seek_secs;
else
@@ -1392,8 +1392,8 @@ static void demux_ogg_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_de
pos = ogg_d->syncpoints[sp].page_pos;
precision = 0;
} else {
- pos = flags & 1 ? 0 : ogg_d->pos;
- if(flags & 2)
+ pos = flags & SEEK_ABSOLUTE ? 0 : ogg_d->pos;
+ if(flags & SEEK_FACTOR)
pos += (demuxer->movi_end - demuxer->movi_start) * rel_seek_secs;
else {
if (ogg_d->final_granulepos > 0) {