mirror of
https://github.com/mpv-player/mpv
synced 2025-01-27 01:53:32 +00:00
The code for the non-networking case is the same whether networking
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:
parent
0d782226c1
commit
87a4e870b7
@ -248,12 +248,9 @@ int stream_fill_buffer(stream_t *s){
|
||||
#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 {
|
||||
len=read(s->fd,s->buffer,STREAM_BUFFER_SIZE);
|
||||
}
|
||||
#else
|
||||
len=read(s->fd,s->buffer,STREAM_BUFFER_SIZE);
|
||||
} 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);
|
||||
|
Loading…
Reference in New Issue
Block a user