Merge changes from topic 'sdp_api_adjustments'
authorGeorge Joseph <gjoseph@digium.com>
Fri, 12 May 2017 17:29:39 +0000 (12:29 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 12 May 2017 17:29:39 +0000 (12:29 -0500)
* changes:
  SDP: Make process possible multiple fmtp attributes per rtpmap.
  SDP: Explicitly stop a RTP instance before destoying it.
  SDP: Rework merge_capabilities().
  SDP: Update ast_get_topology_from_sdp() to keep RTP map.


Trivial merge