Commit 366ec46f authored by Laurent Aimar's avatar Laurent Aimar

Fixed mms udp polling and network timeout.

parent 10c08ec8
...@@ -1088,13 +1088,13 @@ static int NetFillBuffer( access_t *p_access ) ...@@ -1088,13 +1088,13 @@ static int NetFillBuffer( access_t *p_access )
} }
if( i_udp > 0 ) if( i_udp > 0 )
{ {
ufd[nfd].fd = p_sys->i_handle_tcp; ufd[nfd].fd = p_sys->i_handle_udp;
ufd[nfd].events = POLLIN; ufd[nfd].events = POLLIN;
nfd++; nfd++;
} }
/* We'll wait 0.5 second if nothing happens */ /* We'll wait 0.5 second if nothing happens */
timeout = 500; timeout = __MIN( 500, p_sys->i_timeout );
if( i_try * timeout > p_sys->i_timeout ) if( i_try * timeout > p_sys->i_timeout )
{ {
...@@ -1107,7 +1107,8 @@ static int NetFillBuffer( access_t *p_access ) ...@@ -1107,7 +1107,8 @@ static int NetFillBuffer( access_t *p_access )
return -1; return -1;
} }
if( !vlc_object_alive (p_access) || p_access->b_error ) return -1; if( !vlc_object_alive (p_access) || p_access->b_error )
return -1;
//msg_Dbg( p_access, "NetFillBuffer: trying again (select)" ); //msg_Dbg( p_access, "NetFillBuffer: trying again (select)" );
......
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