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

[reimar]

Author: reimar
Date: Tue Nov 17 19:05:54 2009
New Revision: 29925

Log:
Use fill_buffer if available also for STREAMTYPE_STREAM

Modified:
   trunk/stream/stream.c

Modified: trunk/stream/stream.c
==============================================================================
--- trunk/stream/stream.c	Tue Nov 17 17:13:20 2009	(r29924)
+++ trunk/stream/stream.c	Tue Nov 17 19:05:54 2009	(r29925)
@@ -254,6 +254,9 @@ int stream_fill_buffer(stream_t *s){
 	    len=s->streaming_ctrl->streaming_read(s->fd,s->buffer,STREAM_BUFFER_SIZE, s->streaming_ctrl);
     } else
 #endif
+    if (s->fill_buffer)
+      len = s->fill_buffer(s, s->buffer, STREAM_BUFFER_SIZE);
+    else
       len=read(s->fd,s->buffer,STREAM_BUFFER_SIZE);
     break;
   case STREAMTYPE_DS: