kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Brian West 2014-11-07 17:41:31 -06:00
parent 9618ff16b4 a3a80401fd
commit 9db7e6a7f5
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
html5/verto/js/Makefile
View File

@ -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

2
src/switch_core_media.c
View File

@ -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???*/
}