Merge "rtp: Add support for RTP extension negotiation and abs-send-time." into 15

author Joshua Colp <jcolp@digium.com>

Thu, 24 May 2018 20:21:29 +0000 (15:21 -0500)

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

Thu, 24 May 2018 20:21:29 +0000 (15:21 -0500)
author Joshua Colp <jcolp@digium.com>
Thu, 24 May 2018 20:21:29 +0000 (15:21 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 24 May 2018 20:21:29 +0000 (15:21 -0500)
diff --cc include/asterisk/rtp_engine.h
Simple merge
diff --cc main/rtp_engine.c
Simple merge
diff --cc res/res_rtp_asterisk.c
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Thu, 24 May 2018 20:21:29 +0000 (15:21 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Thu, 24 May 2018 20:21:29 +0000 (15:21 -0500)
		1	2
include/asterisk/rtp_engine.h	patch \|	diff1 \|	diff2 \|	blob \| history
main/rtp_engine.c	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_rtp_asterisk.c	patch \|	diff1 \|	diff2 \|	blob \| history