From: Brian West <brian@freeswitch.org>
Date: Fri, 14 Nov 2014 14:37:23 +0000 (-0600)
Subject: Merge pull request #111 in FS/freeswitch from ~JCHAVANTON/freeswitch-opus:FS-6992... 
X-Git-Tag: v1.4.14~2^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c39e301efc2ec60ebf692a25c9cb3a55dd346904;p=thirdparty%2Ffreeswitch.git

Merge pull request #111 in FS/freeswitch from ~JCHAVANTON/freeswitch-opus:FS-6992 to master

* commit '826d42874139c59636de234d7021d485f03b81ee':
  FS-6992 [mod_opus] global configuration or maxplaybackrate and maxaveragebitrate from opus.conf.xml
---

c39e301efc2ec60ebf692a25c9cb3a55dd346904