vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Mon Dec 12 17:37:16 2011 +0200| [644704c9f3ae619f069eefddc0fc0ecf3a1d1948] | committer: Rémi Denis-Courmont
rtp output: do not inherit SRTP settings when SRTP is not built-in > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=644704c9f3ae619f069eefddc0fc0ecf3a1d1948 --- 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 }; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
