[MPlayer-cvslog] r29861 - trunk/stream/stream.c

[reimar]

Author: reimar
Date: Mon Nov  9 15:12:14 2009
New Revision: 29861

Log:
The code for the non-networking case is the same whether networking
support was enabled or no, so avoid duplicating it.

Modified:
   trunk/stream/stream.c

Modified: trunk/stream/stream.c
==============================================================================
--- trunk/stream/stream.c	Mon Nov  9 15:08:35 2009	(r29860)
+++ trunk/stream/stream.c	Mon Nov  9 15:12:14 2009	(r29861)
@@ -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);