From: Joshua Colp <jcolp@digium.com>
Date: Thu, 6 Aug 2015 16:50:25 +0000 (-0500)
Subject: Merge topic 'misc_rtp_tweaks' into 13
X-Git-Tag: 13.6.0-rc1~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba40b07ddcd0e060404d3a518974d75f6e0fd80d;p=thirdparty%2Fasterisk.git

Merge topic 'misc_rtp_tweaks' into 13

* changes:
  rtp_engine.c: Must protect mime_types_len with mime_types_lock.
  res_pjsip_sdp_rtp.c: Fixup some whitespace.
---

ba40b07ddcd0e060404d3a518974d75f6e0fd80d