diff options
author | zuul <zuul@gerrit.asterisk.org> | 2016-08-29 18:06:38 -0500 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-08-29 18:06:38 -0500 |
commit | e91fc62f804a1f3d01d41d40fbaf96de92a7ffa1 (patch) | |
tree | aa96b54b3a3835beb1d153270ff6f0a43d18ff5c | |
parent | b869bf0f38915dbe28bf4c23e8deae7809f0155a (diff) | |
parent | a7487e926153a7770db20c85b070ff0a2da7be37 (diff) |
Merge "pjproject_bundled: Disable srtp use by pjmedia"
-rw-r--r-- | third-party/pjproject/patches/config_site.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/third-party/pjproject/patches/config_site.h b/third-party/pjproject/patches/config_site.h index 07e4d97a9..f9f76dc6c 100644 --- a/third-party/pjproject/patches/config_site.h +++ b/third-party/pjproject/patches/config_site.h @@ -4,6 +4,14 @@ #include <sys/select.h> +/* + * Defining PJMEDIA_HAS_SRTP to 0 does NOT disable Asterisk's ability to use srtp. + * It only disables the pjmedia srtp transport which Asterisk doesn't use. + * The reason for the disable is that while Asterisk works fine with older libsrtp + * versions, newer versions of pjproject won't compile with them. + */ +#define PJMEDIA_HAS_SRTP 0 + #define PJ_HAS_IPV6 1 #define NDEBUG 1 #define PJ_MAX_HOSTNAME (256) |