summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-11-17 18:05:54 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-11-17 18:05:54 +0000
commit00ef6412f47ebe1e841633134982fe2c9f5ff2f1 (patch)
tree49004b0d1f2a03e6784ced23afbeebe0b93c0be9 /stream
parent63ddd1cae57501180f9d1cd2893a882f254a1578 (diff)
downloadmpv-00ef6412f47ebe1e841633134982fe2c9f5ff2f1.tar.bz2
mpv-00ef6412f47ebe1e841633134982fe2c9f5ff2f1.tar.xz
Use fill_buffer if available also for STREAMTYPE_STREAM
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29925 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
-rw-r--r--stream/stream.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/stream/stream.c b/stream/stream.c
index c498eb3624..7fc7ca2315 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -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: