diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-11-23 01:56:21 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-11-23 01:56:21 +0200 |
| commit | 5995bc175aea0417ce7ff7285c1c8fc84ebb5704 (patch) | |
| tree | 7fa0b90e03fc5b3a6447b79754b654bc279f5237 /stream/stream.h | |
| parent | 4c552b2e420ba4cb6d888b12360c7bf63e7cd03a (diff) | |
| parent | af2988cbcef1b057772d44b9f9752be3f15960b0 (diff) | |
| download | mpv-5995bc175aea0417ce7ff7285c1c8fc84ebb5704.tar.bz2 mpv-5995bc175aea0417ce7ff7285c1c8fc84ebb5704.tar.xz | |
Merge svn changes up to r29962
Diffstat (limited to 'stream/stream.h')
| -rw-r--r-- | stream/stream.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/stream/stream.h b/stream/stream.h index 51dbbc925c..b3b5e8f4c3 100644 --- a/stream/stream.h +++ b/stream/stream.h @@ -37,10 +37,14 @@ #define STREAM_READ 0 #define STREAM_WRITE 1 /// Seek flags, if not mannualy set and s->seek isn't NULL -/// STREAM_SEEK is automaticly set -#define STREAM_SEEK_BW 2 -#define STREAM_SEEK_FW 4 -#define STREAM_SEEK (STREAM_SEEK_BW|STREAM_SEEK_FW) +/// MP_STREAM_SEEK is automaticly set +#define MP_STREAM_SEEK_BW 2 +#define MP_STREAM_SEEK_FW 4 +#define MP_STREAM_SEEK (MP_STREAM_SEEK_BW|MP_STREAM_SEEK_FW) +/** This is a HACK for live555 that does not respect the + separation between stream an demuxer and thus is not + actually a stream cache can not be used */ +#define STREAM_NON_CACHEABLE 8 //////////// Open return code #define STREAM_REDIRECTED -2 @@ -273,7 +277,7 @@ inline static int stream_seek(stream_t *s,off_t pos){ } inline static int stream_skip(stream_t *s,off_t len){ - if( (len<0 && (s->flags & STREAM_SEEK_BW)) || (len>2*STREAM_BUFFER_SIZE && (s->flags & STREAM_SEEK_FW)) ) { + if( (len<0 && (s->flags & MP_STREAM_SEEK_BW)) || (len>2*STREAM_BUFFER_SIZE && (s->flags & MP_STREAM_SEEK_FW)) ) { // negative or big skip! return stream_seek(s,stream_tell(s)+len); } |