summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-13 09:47:25 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-13 09:48:40 +0000
commit3c54f5421c645e41730b320985212d51443d450b (patch)
tree0a0cb68e5395680bf49dbc2776f389fd50df2f9f
parent4db043ba5ac875c9dbab62901c758464c580da2c (diff)
downloadchromium_src-3c54f5421c645e41730b320985212d51443d450b.zip
chromium_src-3c54f5421c645e41730b320985212d51443d450b.tar.gz
chromium_src-3c54f5421c645e41730b320985212d51443d450b.tar.bz2
Roll opus 256783:289085
The only changes this picks up are: https://codereview.chromium.org/450213003/ https://codereview.chromium.org/332413005/ BUG=124610 TBR=sergeyu Review URL: https://codereview.chromium.org/464103002 Cr-Commit-Position: refs/heads/master@{#289236} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289236 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--third_party/opus/README.chromium3
2 files changed, 4 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 2cf8436..48ecbc5 100644
--- a/DEPS
+++ b/DEPS
@@ -299,7 +299,7 @@ deps = {
(Var("googlecode_url") % "pywebsocket") + "/trunk/src@790",
"src/third_party/opus/src":
- "/trunk/deps/third_party/opus@256783",
+ "/trunk/deps/third_party/opus@289085",
"src/media/cdm/ppapi/api":
"/trunk/deps/cdm@288172",
diff --git a/third_party/opus/README.chromium b/third_party/opus/README.chromium
index 9a8681a..fa93b8d 100644
--- a/third_party/opus/README.chromium
+++ b/third_party/opus/README.chromium
@@ -10,3 +10,6 @@ This directory contains a copy of Opus library
This library is used by Chrome Remote Desktop and WebRTC for audio stream
encoding/decoding.
+
+Local changes:
+- merged http://git.xiph.org/?p=opus.git;a=commitdiff;h=e70faf98b0465e4f278c72ce2d7b4ad10221a2f2