Add an #undef

[vlc] / modules / demux / rtp.c

diff --git a/modules/demux/rtp.c b/modules/demux/rtp.c
index 8f917efce2ee6cdc4ad55d073cf54f6cf4499c29..3ea499ab7f7ee765d6381cbe7674cfd412129c35 100644 (file)
--- a/modules/demux/rtp.c
+++ b/modules/demux/rtp.c
@@ -182,8 +182,8 @@ static int Open (vlc_object_t *obj)
     {
         case IPPROTO_UDP:
         case IPPROTO_UDPLITE:
-            fd = net_OpenDgram (obj, dhost, dport, shost, sport, AF_UNSPEC,
-                                tp);
+            fd = net_OpenDgram (obj, dhost, (dport + 1) & ~1,
+                                shost, (sport + 1) & ~1, AF_UNSPEC, tp);
             break;
 
          case IPPROTO_DCCP:
@@ -195,14 +195,14 @@ static int Open (vlc_object_t *obj)
 #ifdef SOCK_DCCP
             var_Create (obj, "dccp-service", VLC_VAR_STRING);
             var_SetString (obj, "dccp-service", "RTPV");
-            fd = net_Connect (obj, shost, sport, SOCK_DCCP, tp);
+            fd = net_Connect (obj, shost, (sport + 1) & ~1, SOCK_DCCP, tp);
 #else
             msg_Err (obj, "DCCP support not included");
 #endif
             break;
 
         case IPPROTO_TCP:
-            fd = net_Connect (obj, shost, sport, SOCK_STREAM, tp);
+            fd = net_Connect (obj, shost, (sport + 1) & ~1, SOCK_STREAM, tp);
             break;
     }
 
@@ -237,18 +237,18 @@ static int Open (vlc_object_t *obj)
     if (p_sys->session == NULL)
         goto error;
 
-    char *key = var_GetNonEmptyString (demux, "srtp-key");
+    char *key = var_CreateGetNonEmptyString (demux, "srtp-key");
     if (key)
     {
         p_sys->srtp = srtp_create (SRTP_ENCR_AES_CM, SRTP_AUTH_HMAC_SHA1, 10,
-                                   SRTP_PRF_AES_CM, 0);
+                                   SRTP_PRF_AES_CM, SRTP_RCC_MODE1);
         if (p_sys->srtp == NULL)
         {
             free (key);
             goto error;
         }
 
-        char *salt = var_GetNonEmptyString (demux, "srtp-salt");
+        char *salt = var_CreateGetNonEmptyString (demux, "srtp-salt");
         errno = srtp_setkeystring (p_sys->srtp, key, salt ? salt : "");
         free (salt);
         free (key);