diff options
| author | Jason Parker <jparker@digium.com> | 2013-03-11 15:51:17 -0500 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2013-03-11 15:51:17 -0500 |
| commit | af93a26aa321d3620925e5df68574226ba6cec3c (patch) | |
| tree | c73301bfef50ae9ba250285bbcc7879f5c837e04 /pjmedia/src/pjmedia/transport_srtp.c | |
| parent | 09114052f74fe74bbf652189cedefe41b7141b86 (diff) | |
| parent | 9550ec7a68b8d072f99872d44def5004dbcc2562 (diff) | |
Merge branch 'patch/external-srtp' of github.com:asterisk/pjproject
Conflicts:
build.mak.in
Diffstat (limited to 'pjmedia/src/pjmedia/transport_srtp.c')
| -rw-r--r-- | pjmedia/src/pjmedia/transport_srtp.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pjmedia/src/pjmedia/transport_srtp.c b/pjmedia/src/pjmedia/transport_srtp.c index a661c37..bd0e9b6 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) +#if defined(PJMEDIA_EXTERNAL_SRTP) && (PJMEDIA_EXTERNAL_SRTP != 0) +#include <srtp/srtp.h> +#else #include <srtp.h> +#endif #define THIS_FILE "transport_srtp.c" @@ -315,11 +319,15 @@ static void pjmedia_srtp_deinit_lib(pjmedia_endpt *endpt) PJ_UNUSED_ARG(endpt); +#if defined(PJMEDIA_EXTERNAL_SRTP) && (PJMEDIA_EXTERNAL_SRTP != 0) + PJ_UNUSED_ARG(err); +#else err = srtp_deinit(); if (err != err_status_ok) { PJ_LOG(4, (THIS_FILE, "Failed to deinitialize libsrtp: %s", get_libsrtp_errstr(err))); } +#endif libsrtp_initialized = PJ_FALSE; } |