Merge pull request #652 in FS/freeswitch from ~SJTHOMASON/freeswitch:bugfix/FS-8571-configure-with-disable-srtp-breaks to master

* commit 'e3e6bd875747c379ae78e7528dc66ce210c24ed9':
  Add missing ENABLE_SRTP ifdef to allow building without SRTP
This commit is contained in:
Anthony Minessale II 2016-01-21 23:32:49 -06:00
commit 013fb1d29c

View File

@ -5261,6 +5261,7 @@ static switch_status_t read_rtp_packet(switch_rtp_t *rtp_session, switch_size_t
if (rtp_session->has_rtcp) {
*flags |= SFF_RTCP;
#ifdef ENABLE_SRTP
if (rtp_session->flags[SWITCH_RTP_FLAG_SECURE_RECV]) {
int sbytes = (int) *bytes;
err_status_t stat = 0;
@ -5275,7 +5276,7 @@ static switch_status_t read_rtp_packet(switch_rtp_t *rtp_session, switch_size_t
*bytes = sbytes;
}
#endif
return SWITCH_STATUS_SUCCESS;
}
}