diff options
| author | wm4 <wm4@nowhere> | 2013-06-06 20:39:50 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-06-16 22:05:09 +0200 |
| commit | c5fd3412b6294cb94eee4e20b3a819f53f3623bb (patch) | |
| tree | 0db7d5e2e7210475329e39a1d4d30e2354009da9 | |
| parent | 236577af09149eb59e13b5ce325809a48ac93088 (diff) | |
| download | mpv-c5fd3412b6294cb94eee4e20b3a819f53f3623bb.tar.bz2 mpv-c5fd3412b6294cb94eee4e20b3a819f53f3623bb.tar.xz | |
stream: reset buffer even on EOF/error
This probably didn't matter anywhere, but it's more proper.
| -rw-r--r-- | stream/stream.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/stream/stream.c b/stream/stream.c index eea9e604f8..cc45164b62 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -428,11 +428,9 @@ void stream_unread_buffer(stream_t *s, void *buffer, size_t buffer_size) int stream_fill_buffer(stream_t *s) { int len = stream_read_unbuffered(s, s->buffer, STREAM_BUFFER_SIZE); - if (len <= 0) - return 0; s->buf_pos = 0; - s->buf_len = len; - return len; + s->buf_len = len < 0 ? 0 : len; + return s->buf_len; } // Read between 1..buf_size bytes of data, return how much data has been read. |