RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-27 10:03:32 +00:00
Code Issues Releases Wiki Activity

The code for the non-networking case is the same whether networking

Browse Source 
support was enabled or no, so avoid duplicating it.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29861 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2009-11-09 14:12:14 +00:00
parent 0d782226c1
commit 87a4e870b7
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
stream/stream.c
View File

@ -248,12 +248,9 @@ int stream_fill_buffer(stream_t *s){
#ifdef CONFIG_NETWORK #ifdef CONFIG_NETWORK
if( s->streaming_ctrl!=NULL && s->streaming_ctrl->streaming_read ) { 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); len=s->streaming_ctrl->streaming_read(s->fd,s->buffer,STREAM_BUFFER_SIZE, s->streaming_ctrl);
} else { } else
len=read(s->fd,s->buffer,STREAM_BUFFER_SIZE);
}
#else
len=read(s->fd,s->buffer,STREAM_BUFFER_SIZE);
#endif #endif
len=read(s->fd,s->buffer,STREAM_BUFFER_SIZE);
break; break;
case STREAMTYPE_DS: case STREAMTYPE_DS:
len = demux_read_data((demux_stream_t*)s->priv,s->buffer,STREAM_BUFFER_SIZE); len = demux_read_data((demux_stream_t*)s->priv,s->buffer,STREAM_BUFFER_SIZE);