diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-12-05 18:24:16 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-12-05 18:24:16 -0600 |
| commit | 99d560f19b2260d76a25d2d9535ccf33f0c08afe (patch) | |
| tree | 45ab8be8df9179f74588bedb4a0d62f13e8d9544 | |
| parent | 04f7a58f67d28c42ba66914e900b4757b2ef3be3 (diff) | |
| parent | 31e9e31ea54a527ff86a96e3ff1f6620fb98fd49 (diff) | |
Merge "pjproject: Clean up disabling of WebRTC support." into 15
| -rw-r--r-- | third-party/pjproject/Makefile.rules | 3 | ||||
| -rw-r--r-- | third-party/pjproject/patches/config_site.h | 6 |
2 files changed, 1 insertions, 8 deletions
diff --git a/third-party/pjproject/Makefile.rules b/third-party/pjproject/Makefile.rules index 56b2c4934..715a4b8cd 100644 --- a/third-party/pjproject/Makefile.rules +++ b/third-party/pjproject/Makefile.rules @@ -37,8 +37,7 @@ PJPROJECT_CONFIG_OPTS = $(PJPROJECT_CONFIGURE_OPTS) --prefix=/opt/pjproject \ --disable-ipp \ --disable-libwebrtc \ --without-external-pa \ - --without-external-srtp \ - --without-external-webrtc + --without-external-srtp ifeq ($(findstring TEST_FRAMEWORK,$(MENUSELECT_CFLAGS)),) PJPROJECT_CONFIG_OPTS += --disable-resample --disable-g711-codec diff --git a/third-party/pjproject/patches/config_site.h b/third-party/pjproject/patches/config_site.h index 561b3a231..8f989699f 100644 --- a/third-party/pjproject/patches/config_site.h +++ b/third-party/pjproject/patches/config_site.h @@ -20,12 +20,6 @@ */ #define PJMEDIA_HAS_SRTP 0 -/* - * Defining PJMEDIA_HAS_WEBRTC_AEC to 0 does NOT disable Asterisk's ability to use - * webrtc. It only disables the pjmedia webrtc transport which Asterisk doesn't use. - */ -#define PJMEDIA_HAS_WEBRTC_AEC 0 - #define PJ_HAS_IPV6 1 #define NDEBUG 1 #define PJ_MAX_HOSTNAME (256) |