Merge "SDP: Rework SDP offer/answer model and update capabilities merges."
authorJoshua Colp <jcolp@digium.com>
Wed, 26 Jul 2017 13:20:35 +0000 (08:20 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 26 Jul 2017 13:20:35 +0000 (08:20 -0500)
1  2 
include/asterisk/stream.h
main/stream.c

Simple merge
diff --cc main/stream.c
Simple merge