Merge "SDP: Rework SDP offer/answer model and update capabilities merges."

author Joshua Colp <jcolp@digium.com>

Wed, 26 Jul 2017 13:20:35 +0000 (08:20 -0500)

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

Wed, 26 Jul 2017 13:20:35 +0000 (08:20 -0500)
author Joshua Colp <jcolp@digium.com>
Wed, 26 Jul 2017 13:20:35 +0000 (08:20 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 26 Jul 2017 13:20:35 +0000 (08:20 -0500)
diff --cc include/asterisk/stream.h
Simple merge
diff --cc main/stream.c
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Wed, 26 Jul 2017 13:20:35 +0000 (08:20 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Wed, 26 Jul 2017 13:20:35 +0000 (08:20 -0500)
		1	2
include/asterisk/stream.h	patch \|	diff1 \|	diff2 \|	blob \| history
main/stream.c	patch \|	diff1 \|	diff2 \|	blob \| history