[vlc-commits] rtp output: do not inherit SRTP settings when SRTP is not built-in

[Rémi Denis-Courmont]

vlc/vlc-1.2 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Dec 12 17:37:16 2011 +0200| [1940c29a83d344f4a3f28071a63276d0dad7f695] | committer: Rémi Denis-Courmont

rtp output: do not inherit SRTP settings when SRTP is not built-in

(cherry picked from commit 644704c9f3ae619f069eefddc0fc0ecf3a1d1948)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=1940c29a83d344f4a3f28071a63276d0dad7f695
---

 modules/stream_out/rtp.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index 103bb62..95d350c 100644
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -272,7 +272,10 @@ vlc_module_end ()
 static const char *const ppsz_sout_options[] = {
     "dst", "name", "port", "port-audio", "port-video", "*sdp", "ttl", "mux",
     "sap", "description", "url", "email", "phone",
-    "proto", "rtcp-mux", "caching", "key", "salt",
+    "proto", "rtcp-mux", "caching",
+#ifdef HAVE_SRTP
+    "key", "salt",
+#endif
     "mp4a-latm", NULL
 };