Merge remote-tracking branch 'origin/master'

autoload_configs/modules.conf.xml

@@ -32,8 +32,8 @@
         <!--<load module="mod_g723_1"/>-->
         <!--<load module="mod_amr"/>-->
         <!--<load module="mod_ilbc"/>-->
-        <!--<load module="mod_speex"/>-->
-        <!--<load module="mod_h26x"/>-->
+        <load module="mod_speex"/>
+        <load module="mod_h26x"/>
         <!--<load module="mod_celt"/>-->
         <!--<load module="mod_opus"/>-->
 

freeswitch.xml

@@ -34,9 +34,7 @@
     <X-PRE-PROCESS cmd="set" data="ignore_display_updates=true"/>
     <X-PRE-PROCESS cmd="set" data="recordings_dir=/tmp/"/>
 
-    <!--<X-PRE-PROCESS cmd="set" data="codecs=G7221@32000h,G7221@16000h,G722,PCMU,PCMA,GSM"/>-->
-    <!--<X-PRE-PROCESS cmd="set" data="codecs=G729,PCMU,PCMA,GSM"/>-->
-    <X-PRE-PROCESS cmd="set" data="codecs=G729,PCMU,PCMA,GSM"/>
+    <X-PRE-PROCESS cmd="set" data="codecs=H261,H263,H264,G7221@32000h,G7221@16000h,G722,PCMU,PCMA,GSM"/>
 
     <section name="configuration" description="Various Configuration">
         <X-PRE-PROCESS cmd="include" data="autoload_configs/*.xml"/>