summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mov.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_mov.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_mov.c')
-rw-r--r--libmpdemux/demux_mov.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c
index 7bf061698b..4cbf07e7ab 100644
--- a/libmpdemux/demux_mov.c
+++ b/libmpdemux/demux_mov.c
@@ -2202,19 +2202,19 @@ if(trak->pos==0 && trak->stream_header_len>0){
static float mov_seek_track(mov_track_t* trak,float pts,int flags){
// printf("MOV track seek called %5.3f \n",pts);
- if(flags&2) pts*=trak->length; else pts*=(float)trak->timescale;
+ if(flags&SEEK_FACTOR) pts*=trak->length; else pts*=(float)trak->timescale;
if(trak->samplesize){
int sample=pts/trak->duration;
// printf("MOV track seek - chunk: %d (pts: %5.3f dur=%d) \n",sample,pts,trak->duration);
- if(!(flags&1)) sample+=trak->chunks[trak->pos].sample; // relative
+ if(!(flags&SEEK_ABSOLUTE)) sample+=trak->chunks[trak->pos].sample; // relative
trak->pos=0;
while(trak->pos<trak->chunks_size && trak->chunks[trak->pos].sample<sample) ++trak->pos;
if (trak->pos == trak->chunks_size) return -1;
pts=(float)(trak->chunks[trak->pos].sample*trak->duration)/(float)trak->timescale;
} else {
unsigned int ipts;
- if(!(flags&1)) pts+=trak->samples[trak->pos].pts;
+ if(!(flags&SEEK_ABSOLUTE)) pts+=trak->samples[trak->pos].pts;
if(pts<0) pts=0;
ipts=pts;
//printf("MOV track seek - sample: %d \n",ipts);