From 6cb31d5d4c8720004ea3c1ff7d57983da23d3de3 Mon Sep 17 00:00:00 2001 From: Marian Durkovic Date: Tue, 22 Nov 2005 07:51:20 +0000 Subject: [PATCH] backport [13283] [13272] --- modules/access/udp.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/modules/access/udp.c b/modules/access/udp.c index 0eedf81ac3..602a92bbe7 100644 --- a/modules/access/udp.c +++ b/modules/access/udp.c @@ -191,16 +191,7 @@ static int Open( vlc_object_t *p_this ) /* Set up p_access */ p_access->pf_read = NULL; - if( !strcasecmp( p_access->psz_access, "rtp" ) - || !strcasecmp( p_access->psz_access, "rtp4" ) - || !strcasecmp( p_access->psz_access, "rtp6" ) ) - { - p_access->pf_block = BlockRTP; - } - else - { - p_access->pf_block = BlockChoose; - } + p_access->pf_block = BlockChoose; p_access->pf_control = Control; p_access->pf_seek = NULL; p_access->info.i_update = 0; @@ -528,9 +519,6 @@ static block_t *BlockRTP( access_t *p_access ) if ( !p ) return NULL; - if ( !p_access->info.b_prebuffered ) - return BlockPrebufferRTP( p_access, p ); - rtp_ChainInsert( p_access, p ); } @@ -564,6 +552,7 @@ static block_t *BlockChoose( access_t *p_access ) { msg_Dbg( p_access, "detected TS over raw UDP" ); p_access->pf_block = BlockUDP; + p_access->info.b_prebuffered = VLC_TRUE; return p_block; } @@ -581,6 +570,7 @@ static block_t *BlockChoose( access_t *p_access ) { msg_Dbg( p_access, "no supported RTP header detected" ); p_access->pf_block = BlockUDP; + p_access->info.b_prebuffered = VLC_TRUE; return p_block; } @@ -604,6 +594,7 @@ static block_t *BlockChoose( access_t *p_access ) default: msg_Dbg( p_access, "no RTP header detected" ); p_access->pf_block = BlockUDP; + p_access->info.b_prebuffered = VLC_TRUE; return p_block; } -- 2.39.2