diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-11-22 15:18:21 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-11-22 15:18:21 +0000 |
| commit | af2988cbcef1b057772d44b9f9752be3f15960b0 (patch) | |
| tree | bbac3b16fb874535c07b693d96a59484284a408e /stream/stream.h | |
| parent | 302527a111cc88cc0bdd16d74d161eea9577da18 (diff) | |
| download | mpv-af2988cbcef1b057772d44b9f9752be3f15960b0.tar.bz2 mpv-af2988cbcef1b057772d44b9f9752be3f15960b0.tar.xz | |
Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too many
name clashes, in particular with Windows headers (which define STREAM_SEEK as an enum type).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29962 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream/stream.h')
| -rw-r--r-- | stream/stream.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/stream/stream.h b/stream/stream.h index 4aed24526a..4da8a1ae43 100644 --- a/stream/stream.h +++ b/stream/stream.h @@ -37,10 +37,10 @@ #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 */ @@ -276,7 +276,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); } |