diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2014-01-03 03:44:05 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2014-01-03 03:44:05 +0000 |
| commit | 499bda86d351aed23348aa38103738231ae7d4c1 (patch) | |
| tree | 0081194ef6f5ddfe6c32f8f1624429418abaea69 /pjmedia/src | |
| parent | f00de059ddcdc4252b313b4194bc9fdd4b053c38 (diff) | |
Close #1720:
- Added configure flags --with-external-srtp and --disable-resample.
- Added macro setting PJMEDIA_LIBSRTP_AUTO_INIT_DEINIT to allow application to handle libsrtp init & deinit by itself.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4701 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/src')
| -rw-r--r-- | pjmedia/src/pjmedia/transport_srtp.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pjmedia/src/pjmedia/transport_srtp.c b/pjmedia/src/pjmedia/transport_srtp.c index 85b43282..2e76c506 100644 --- a/pjmedia/src/pjmedia/transport_srtp.c +++ b/pjmedia/src/pjmedia/transport_srtp.c @@ -30,7 +30,11 @@ #if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0) -#include <srtp.h> +#if defined(PJMEDIA_EXTERNAL_SRTP) && (PJMEDIA_EXTERNAL_SRTP != 0) +# include <srtp/srtp.h> +#else +# include <srtp.h> +#endif #define THIS_FILE "transport_srtp.c" @@ -276,6 +280,7 @@ static void pjmedia_srtp_deinit_lib(pjmedia_endpt *endpt); PJ_DEF(pj_status_t) pjmedia_srtp_init_lib(pjmedia_endpt *endpt) { +#if PJMEDIA_LIBSRTP_AUTO_INIT_DEINIT if (libsrtp_initialized == PJ_FALSE) { err_status_t err; @@ -298,6 +303,9 @@ PJ_DEF(pj_status_t) pjmedia_srtp_init_lib(pjmedia_endpt *endpt) libsrtp_initialized = PJ_TRUE; } +#else + PJ_UNUSED_ARG(endpt); +#endif return PJ_SUCCESS; } |