summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-05 10:51:00 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-05 10:51:00 +0000
commiteb440953702b7c125c178730c0a665483c3eb2e7 (patch)
tree426728421253b70d6f641731211165787f98c33e
parent7457ff25073d43d82b7b3125278213ccd7fa39ec (diff)
downloadchromium_src-eb440953702b7c125c178730c0a665483c3eb2e7.zip
chromium_src-eb440953702b7c125c178730c0a665483c3eb2e7.tar.gz
chromium_src-eb440953702b7c125c178730c0a665483c3eb2e7.tar.bz2
Roll DEPS for speex to get gyp changes for use_system_speex:
http://src.chromium.org/viewvc/chrome?view=rev&revision=70427 Convert all users to the shim header for speex. BUG=68524 TEST=none Review URL: http://codereview.chromium.org/5968013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70499 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--chrome/browser/speech/speech_recognizer.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 4119824..44ff1e9 100644
--- a/DEPS
+++ b/DEPS
@@ -176,7 +176,7 @@ deps = {
Var("libjingle_revision"),
"src/third_party/speex":
- "/trunk/deps/third_party/speex@56515",
+ "/trunk/deps/third_party/speex@70427",
"src/third_party/libsrtp/src":
"/trunk/deps/third_party/libsrtp@60080",
diff --git a/chrome/browser/speech/speech_recognizer.cc b/chrome/browser/speech/speech_recognizer.cc
index 3140d46..277393c 100644
--- a/chrome/browser/speech/speech_recognizer.cc
+++ b/chrome/browser/speech/speech_recognizer.cc
@@ -10,7 +10,7 @@
#include "chrome/browser/browser_thread.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/net/url_request_context_getter.h"
-#include "third_party/speex/include/speex/speex.h"
+#include "third_party/speex/speex.h"
using media::AudioInputController;
using std::list;