From: George Joseph <gjoseph@digium.com>
Date: Fri, 12 May 2017 17:29:39 +0000 (-0500)
Subject: Merge changes from topic 'sdp_api_adjustments'
X-Git-Tag: 15.0.0-beta1~142
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce4d8dac91631599452a9c7aa9c81001704afb62;p=thirdparty%2Fasterisk.git

Merge changes from topic 'sdp_api_adjustments'

* 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.
---

ce4d8dac91631599452a9c7aa9c81001704afb62