summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-06-18 16:36:39 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:11:07 +0200
commit27408d4f14f4fc99464c1db8f81288a6ecffb373 (patch)
tree888d246ca7c9782a238bc9eebb041352bac5226c
parent1b078bc2c57daf6175b63f9b4c328db309fda2f8 (diff)
downloadmpv-27408d4f14f4fc99464c1db8f81288a6ecffb373.tar.bz2
mpv-27408d4f14f4fc99464c1db8f81288a6ecffb373.tar.xz
stream.h: support backswards stream_skip() within buffer
Never just ignore a backwards skip, even if the stream is not seekable it might still be in a buffer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31465 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--stream/stream.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/stream/stream.h b/stream/stream.h
index 40ea321bc4..9ee4902c69 100644
--- a/stream/stream.h
+++ b/stream/stream.h
@@ -303,7 +303,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 & MP_STREAM_SEEK_BW)) || (len>2*STREAM_BUFFER_SIZE && (s->flags & MP_STREAM_SEEK_FW)) ) {
+ if( len<0 || (len>2*STREAM_BUFFER_SIZE && (s->flags & MP_STREAM_SEEK_FW)) ) {
// negative or big skip!
return stream_seek(s,stream_tell(s)+len);
}