[vlc-commits] decomp: use vlc_read_i11e() as appropriate

Rémi Denis-Courmont git at videolan.org
Wed Jul 1 18:22:11 CEST 2015


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Jun 30 23:52:51 2015 +0300| [7b45661380112cf63b393db7e106b6cfbe302c37] | committer: Rémi Denis-Courmont

decomp: use vlc_read_i11e() as appropriate

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7b45661380112cf63b393db7e106b6cfbe302c37
---

 modules/stream_filter/decomp.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/stream_filter/decomp.c b/modules/stream_filter/decomp.c
index 19ea419..06435cd 100644
--- a/modules/stream_filter/decomp.c
+++ b/modules/stream_filter/decomp.c
@@ -45,6 +45,7 @@
 #else
 # undef HAVE_VMSPLICE
 #endif
+#include <vlc_interrupt.h>
 
 #include <signal.h>
 
@@ -223,7 +224,7 @@ static int Read (stream_t *stream, void *buf, unsigned int buflen)
     }
     assert ((buf != NULL) || (buflen == 0));
 
-    ssize_t val = net_Read (stream, sys->read_fd, buf, buflen, false);
+    ssize_t val = vlc_read_i11e (sys->read_fd, buf, buflen);
     if (val > 0)
     {
         sys->offset += val;
@@ -261,8 +262,8 @@ static int Peek (stream_t *stream, const uint8_t **pbuf, unsigned int len)
     {
         ssize_t val;
 
-        val = net_Read (stream, sys->read_fd,
-                        peeked->p_buffer + curlen, len - curlen, false);
+        val = vlc_read_i11e (sys->read_fd, peeked->p_buffer + curlen,
+                           len - curlen);
         if (val <= 0)
             break;
         curlen += val;



More information about the vlc-commits mailing list