Mercurial > mplayer.hg
comparison stream/stream.h @ 34140:a08f68ee111e
Fix compilation: Partly revert r34227.
| author | cehoyos |
|---|---|
| date | Fri, 21 Oct 2011 08:49:48 +0000 |
| parents | cc8dfde2b6c5 |
| children | beafae9de2be |
comparison
equal
deleted
inserted
replaced
| 34139:cc8dfde2b6c5 | 34140:a08f68ee111e |
|---|---|
| 292 return s->pos+s->buf_pos-s->buf_len; | 292 return s->pos+s->buf_pos-s->buf_len; |
| 293 } | 293 } |
| 294 | 294 |
| 295 inline static int stream_seek(stream_t *s,off_t pos){ | 295 inline static int stream_seek(stream_t *s,off_t pos){ |
| 296 | 296 |
| 297 mp_dbg(MSGT_DEMUX, MSGL_DBG3, "seek to 0x%"PRIu64"X\n", pos); | 297 mp_dbg(MSGT_DEMUX, MSGL_DBG3, "seek to 0x%llX\n", (long long)pos); |
| 298 | 298 |
| 299 if (pos < 0) { | 299 if (pos < 0) { |
| 300 mp_msg(MSGT_DEMUX, MSGL_ERR, | 300 mp_msg(MSGT_DEMUX, MSGL_ERR, "Invalid seek to negative position %llx!\n", |
| 301 "Invalid seek to negative position %"PRIu64"x!\n", pos); | 301 (long long)pos); |
| 302 pos = 0; | 302 pos = 0; |
| 303 } | 303 } |
| 304 if(pos<s->pos){ | 304 if(pos<s->pos){ |
| 305 off_t x=pos-(s->pos-s->buf_len); | 305 off_t x=pos-(s->pos-s->buf_len); |
| 306 if(x>=0){ | 306 if(x>=0){ |