Merge "res_rtp_asterisk: Use separate SRTP session for RTCP with DTLS" into 13

author Joshua Colp <jcolp@digium.com>

Tue, 5 Apr 2016 10:37:09 +0000 (05:37 -0500)

committer Gerrit Code Review <gerrit2@gerrit.digium.api>

Tue, 5 Apr 2016 10:37:09 +0000 (05:37 -0500)
author Joshua Colp <jcolp@digium.com>
Tue, 5 Apr 2016 10:37:09 +0000 (05:37 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 5 Apr 2016 10:37:09 +0000 (05:37 -0500)
diff --cc include/asterisk/rtp_engine.h
Simple merge
diff --cc res/res_rtp_asterisk.c
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Tue, 5 Apr 2016 10:37:09 +0000 (05:37 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Tue, 5 Apr 2016 10:37:09 +0000 (05:37 -0500)
		1	2
include/asterisk/rtp_engine.h	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_rtp_asterisk.c	patch \|	diff1 \|	diff2 \|	blob \| history