Merge branch 'master' of ssh://stash.freeswitch.org:7999/fs/freeswitch

html5/verto/js/Makefile

@@ -8,8 +8,14 @@ jsmin: jsmin.c
 verto-min.js: jsmin $(JSFILES)
 	cat $(JSFILES) | ./jsmin > $@
 
+verto-max.js: jsmin $(JSFILES)
+	cat $(JSFILES) > $@
+
 clean:
-	rm -f verto-min.js jsmin *~
+	rm -f verto-min.js verto-max.js jsmin *~
 
 install-demo: all
 	cp verto-min.js ../demo/js
+
+install-maxdemo: all verto-max.js
+	cp verto-max.js ../demo/js/verto-min.js

src/switch_core_media.c

@@ -235,7 +235,7 @@ SWITCH_DECLARE(int) switch_core_media_crypto_keylen(switch_rtp_crypto_key_type_t
 static int get_channels(const char *name, int dft)
 {
 
-	if (!zstr(name) && switch_true(switch_core_get_variable("NDLB_broken_opus_sdp")) && !strcasecmp(name, "opus")) {
+	if (!zstr(name) && !switch_true(switch_core_get_variable("NDLB_broken_opus_sdp")) && !strcasecmp(name, "opus")) {
 		return 2; /* IKR???*/
 	}