From 0f2816d18b2308ca1fc6f42617fd1728fa4905c1 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Fri, 7 Nov 2014 17:10:53 -0600 Subject: [PATCH 1/2] add command to comppile non-minified js file for testing --- html5/verto/js/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/html5/verto/js/Makefile b/html5/verto/js/Makefile index 9ee3be803f..d5144b1193 100644 --- a/html5/verto/js/Makefile +++ b/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 From a3a80401fd7bb0cf4df124cf4e50040bb9c7be7b Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Fri, 7 Nov 2014 17:11:40 -0600 Subject: [PATCH 2/2] fix regression caused by missing ! char in commit: 4eb5b388 --- src/switch_core_media.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/switch_core_media.c b/src/switch_core_media.c index 81b22fa381..b5a0398308 100644 --- a/src/switch_core_media.c +++ b/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???*/ }