diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2016-08-29 16:50:25 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-08-29 16:50:25 -0500 |
| commit | cfab4d4d41a3daf6b0dc4a458dac3e814192c3ce (patch) | |
| tree | cad2985c0710ce1cae936afa709579c11cf4e6e1 | |
| parent | fcba60749c61814622e8519d3c826d78967f774f (diff) | |
| parent | fb82fdb01384fee774bf04ec67ef3c6c6f8476c2 (diff) | |
Merge "pjproject_bundled: Disable srtp use by pjmedia" into 13
| -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) |