Commit 719bc6ed authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

OSS access: don't choke on EINTR

(cherry picked from commit 0169865b68c30b1505beae2489f8f08e9619a337)
parent 059e3fc5
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include <vlc_demux.h> #include <vlc_demux.h>
#include <vlc_fs.h> #include <vlc_fs.h>
#include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
...@@ -272,6 +273,8 @@ static int Demux( demux_t *p_demux ) ...@@ -272,6 +273,8 @@ static int Demux( demux_t *p_demux )
/* Wait for data */ /* Wait for data */
if( poll( &fd, 1, 10 ) ) /* Timeout after 0.01 seconds. Bigger delays are an issue when used with/as an input-slave since all the inputs run in the same thread. */ if( poll( &fd, 1, 10 ) ) /* Timeout after 0.01 seconds. Bigger delays are an issue when used with/as an input-slave since all the inputs run in the same thread. */
{ {
if( errno == EINTR )
continue;
if( fd.revents & (POLLIN|POLLPRI) ) if( fd.revents & (POLLIN|POLLPRI) )
{ {
p_block = GrabAudio( p_demux ); p_block = GrabAudio( p_demux );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment