Mercurial > mplayer.hg
diff stream/stream_dvd.c @ 35885:3389262720da
Fix previous commit, off_t must be replaced by int64_t
The commit replacing off_t by uint64_t was by accident,
I meant to commit this variant.
off_t must be replaced by a signed type to avoid breaking
things like seeking backwards and also detecting errors
from e.g. lseek without too complex hacks.
author | reimar |
---|---|
date | Sat, 16 Mar 2013 13:38:34 +0000 |
parents | b5abdfe9bc61 |
children | 389d43c448b3 |
line wrap: on
line diff
--- a/stream/stream_dvd.c Sat Mar 16 13:38:30 2013 +0000 +++ b/stream/stream_dvd.c Sat Mar 16 13:38:34 2013 +0000 @@ -416,7 +416,7 @@ static int fill_buffer(stream_t *s, char *buf, int len) { - uint64_t pos; + int64_t pos; if (len < 2048) return -1; pos = dvd_read_sector(s->priv, buf); @@ -426,7 +426,7 @@ return 2048; // full sector } -static int seek(stream_t *s, uint64_t newpos) { +static int seek(stream_t *s, int64_t newpos) { s->pos=newpos; // real seek dvd_seek(s->priv,s->pos/2048); return 1; @@ -504,7 +504,7 @@ dvd_priv_t *d = stream->priv; ptt_info_t ptt; pgc_t *pgc; - uint64_t pos; + int64_t pos; if(!vts_file || !tt_srpt) return 0; @@ -597,7 +597,7 @@ unsigned int i, j, k, timeunit, ac_time, tmap_sector=0, cell_sector=0, vobu_sector=0; int t=0; double tm, duration; - uint64_t pos = -1; + int64_t pos = -1; dvd_priv_t *d = stream->priv; vts_tmapt_t *vts_tmapt = vts_file->vts_tmapt;