diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:34:16 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:34:16 +0200 |
commit | 327463be525b12e3d00d5fa0e8e15d5000fcd27b (patch) | |
tree | 37db96b1a1b4b1b941706e4e4c4dcdec9cbd4ed2 /stream/stream.c | |
parent | 7e90be7093daa79fc26dedac6cfb90e87c8acaff (diff) | |
parent | 88a8591bc6ae6b9fdbf293ac75967cb9e21f4875 (diff) | |
download | mpv-327463be525b12e3d00d5fa0e8e15d5000fcd27b.tar.bz2 mpv-327463be525b12e3d00d5fa0e8e15d5000fcd27b.tar.xz |
Merge svn changes up to r30672
Diffstat (limited to 'stream/stream.c')
-rw-r--r-- | stream/stream.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/stream/stream.c b/stream/stream.c index 8388a1a1a6..562675cb29 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -261,7 +261,7 @@ stream_t *open_output_stream(char *filename, struct MPOpts *options) int stream_fill_buffer(stream_t *s){ int len; - if (/*s->fd == NULL ||*/ s->eof) { s->buf_pos = s->buf_len = 0; return 0; } + if (/*s->fd == NULL ||*/ s->eof) { return 0; } switch(s->type){ case STREAMTYPE_STREAM: #ifdef CONFIG_NETWORK @@ -282,7 +282,7 @@ int stream_fill_buffer(stream_t *s){ default: len= s->fill_buffer ? s->fill_buffer(s,s->buffer,STREAM_BUFFER_SIZE) : 0; } - if(len<=0){ s->eof=1; s->buf_pos=s->buf_len=0; return 0; } + if(len<=0){ s->eof=1; return 0; } s->buf_pos=0; s->buf_len=len; s->pos+=len; @@ -393,8 +393,8 @@ return 1; void stream_reset(stream_t *s){ if(s->eof){ - s->pos=0; //ftell(f); -// s->buf_pos=s->buf_len=0; + s->pos=0; + s->buf_pos=s->buf_len=0; s->eof=0; } if(s->control) s->control(s,STREAM_CTRL_RESET,NULL); |