Mercurial > mplayer.hg
changeset 29819:2c2733d12823
The code for the non-networking case is the same whether networking
support was enabled or no, so avoid duplicating it.
| author | reimar |
|---|---|
| date | Mon, 09 Nov 2009 14:12:14 +0000 |
| parents | d133a1a83c17 |
| children | b33846197f5c |
| files | stream/stream.c |
| diffstat | 1 files changed, 2 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/stream/stream.c Mon Nov 09 14:08:35 2009 +0000 +++ b/stream/stream.c Mon Nov 09 14:12:14 2009 +0000 @@ -248,12 +248,9 @@ #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); - } else { + } else +#endif len=read(s->fd,s->buffer,STREAM_BUFFER_SIZE); - } -#else - len=read(s->fd,s->buffer,STREAM_BUFFER_SIZE); -#endif break; case STREAMTYPE_DS: len = demux_read_data((demux_stream_t*)s->priv,s->buffer,STREAM_BUFFER_SIZE);