From: Mike Jerris <mike@jerris.com>
Date: Tue, 21 Mar 2017 16:45:26 +0000 (+0000)
Subject: Merge pull request #1232 in FS/freeswitch from ~ANTONIO/freeswitch:bugfix/FS-10160... 
X-Git-Tag: v1.8.0~698
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82a9a3e61030ace95e8b4da39eedd6b412ba0b67;p=thirdparty%2Ffreeswitch.git

Merge pull request #1232 in FS/freeswitch from ~ANTONIO/freeswitch:bugfix/FS-10160-segfault-conference-with-parameter to master

* commit '2ec5ffb5f5f58fe19f0e9f5abe274424d39206a1':
  FS-10160 [mod_conference] fix segfault when using video-mode=mux
---

82a9a3e61030ace95e8b4da39eedd6b412ba0b67