Merge branch 'master' into lpcm_encoder

[vlc] / modules / access / udp.c

diff --git a/modules/access/udp.c b/modules/access/udp.c
index cb5068bcf484001599c6d7aecae9e9e1f5acd451..d243a290eac32e8dbdfd9159b0651d5c81fd3a5d 100644 (file)
--- a/modules/access/udp.c
+++ b/modules/access/udp.c
@@ -63,14 +63,9 @@ vlc_module_begin ()
     add_integer( "udp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
                  CACHING_LONGTEXT, true )
         change_safe()
-    add_obsolete_integer( "rtp-late" )
-    add_obsolete_bool( "udp-auto-mtu" )
 
     set_capability( "access", 0 )
-    add_shortcut( "udp" )
-    add_shortcut( "udpstream" )
-    add_shortcut( "udp4" )
-    add_shortcut( "udp6" )
+    add_shortcut( "udp", "udpstream", "udp4", "udp6" )
 
     set_callbacks( Open, Close )
 vlc_module_end ()
@@ -115,7 +110,7 @@ static int Open( vlc_object_t *p_this )
         }
     }
 
-    i_bind_port = var_CreateGetInteger( p_access, "server-port" );
+    i_bind_port = var_InheritInteger( p_access, "server-port" );
 
     /* Parse psz_name syntax :
      * [serveraddr[:serverport]][@[bindaddr]:[bindport]] */
@@ -205,7 +200,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
         /* */
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
-            *pi_64 = (int64_t)var_GetInteger(p_access,"udp-caching") * 1000;
+            *pi_64 = var_GetInteger(p_access,"udp-caching") * 1000;
             break;
 
         /* */