diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-11-16 06:54:22 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-11-16 07:01:46 +0200 |
| commit | 287b62163eed8811b6cd33716c0691d328947d48 (patch) | |
| tree | 3143d2cb17b32a19e3e7e0aa428210d1bba3eb0b /stream/stream.c | |
| parent | 507f4fe6c7811558b1367e4b64855ae7f9bc8da8 (diff) | |
| parent | b411278fbb00767b8013604157a43e0203f66f4c (diff) | |
| download | mpv-287b62163eed8811b6cd33716c0691d328947d48.tar.bz2 mpv-287b62163eed8811b6cd33716c0691d328947d48.tar.xz | |
Merge svn changes up to r29912
Diffstat (limited to 'stream/stream.c')
| -rw-r--r-- | stream/stream.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/stream/stream.c b/stream/stream.c index 8b8a84760a..8570f0b125 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -245,13 +245,11 @@ int stream_fill_buffer(stream_t *s){ case STREAMTYPE_STREAM: #ifdef CONFIG_NETWORK if( s->streaming_ctrl!=NULL && s->streaming_ctrl->streaming_read ) { - len=s->streaming_ctrl->streaming_read(s->fd,s->buffer,STREAM_BUFFER_SIZE, s->streaming_ctrl);break; - } else { - len=read(s->fd,s->buffer,STREAM_BUFFER_SIZE);break; - } -#else - len=read(s->fd,s->buffer,STREAM_BUFFER_SIZE);break; + len=s->streaming_ctrl->streaming_read(s->fd,s->buffer,STREAM_BUFFER_SIZE, s->streaming_ctrl); + } else #endif + len=read(s->fd,s->buffer,STREAM_BUFFER_SIZE); + break; case STREAMTYPE_DS: len = demux_read_data((demux_stream_t*)s->priv,s->buffer,STREAM_BUFFER_SIZE); break; |