Conflicts:
	src/switch_core_media.c
This commit is contained in:
Anthony Minessale
2015-03-26 17:48:39 -05:00
parent 183570bd94
commit 2c92ef31e3
3 changed files with 40 additions and 21 deletions

View File

@@ -282,7 +282,7 @@ SWITCH_DECLARE(payload_map_t *) switch_core_media_add_payload_map(switch_core_se
uint32_t channels,
uint8_t negotiated);
SWITCH_DECLARE(switch_status_t) switch_core_media_check_autoadj(switch_core_session_t *session);
SWITCH_DECLARE(switch_rtp_crypto_key_type_t) switch_core_media_crypto_str2type(const char *str);
SWITCH_DECLARE(const char *) switch_core_media_crypto_type2str(switch_rtp_crypto_key_type_t type);
SWITCH_DECLARE(int) switch_core_media_crypto_keylen(switch_rtp_crypto_key_type_t type);