backport [13283] [13272]

diff --git a/modules/access/udp.c b/modules/access/udp.c
index 0eedf81ac30b824dc7149bfcd241bfe67cfd8501..602a92bbe71609abc5e5811780e2e8e7f1e2b736 100644 (file)
--- 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;
     }