Skip to content

Commit

Permalink
Merge branch 'release-0.28'
Browse files Browse the repository at this point in the history
  • Loading branch information
longsleep committed Sep 7, 2016
2 parents cafca13 + e396020 commit 9bb8426
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 1 deletion.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
## 0.28.1

* Filter rtx support from remote SDP for Chrome <= 38
* Fix Go 1.4 detection for minor versions
* Bump minimal Go version
* Fix Go 1.4 release target
* Allow dist_gopath to fail
* Check if system GOPATH exists
* Add make tarball to travis


## 0.28.0

* Update Git hooks, to auto check translations
Expand Down
3 changes: 2 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ AM_CONDITIONAL([DEFAULT_VENDOR_GOPATH], [test x"${VENDOR_GOPATH}" == x""])
AM_CONDITIONAL([READONLY_VENDOR_GOPATH], [test -n "${VENDOR_GOPATH}" -a ! -w "${VENDOR_GOPATH}"])
AM_COND_IF(DEFAULT_VENDOR_GOPATH, [AC_SUBST(VENDOR_GOPATH, $PWD/vendor)])
AC_MSG_RESULT([$VENDOR_GOPATH])
AM_CONDITIONAL([GO_14], [test x"${GO_VERSION}" == x"1.4"])
AX_COMPARE_VERSION([$GO_VERSION], [lt], [1.5], [GO_14="1"], [GO_14="0"])
AM_CONDITIONAL([GO_14], [test x"${GO_14}" = x"1"])

AC_PATH_PROGS([NODEJS],[nodejs node])
if test x"${NODEJS}" == x"" ; then
Expand Down
5 changes: 5 additions & 0 deletions static/js/mediastream/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,11 @@ define([], function() {
// This change breaks very old versions of WebRTC. So we change it back locally
// for Chrome <= 38 which makes things work fine again.
sdp = sdp.replace(/UDP\/TLS\/RTP\/SAVPF/g, "RTP/SAVPF")

// Remove all rtx support from remote sdp, which is geneated by
// Chrome 48+ but does not work with <= 38.
sdp = sdp.replace(/a=rtpmap:\d+ rtx\/\d+\r\n/i, "");
sdp = sdp.replace(/a=fmtp:\d+ apt=\d+\r\n/i, "");
}
return sdp;
}
Expand Down

0 comments on commit 9bb8426

Please sign in to comment.