Roll speex, flac, libvpx DEPS to get shim header changes.

R=dalecurtis
TBR=darin,garykac

BUG=165264

Review URL: https://codereview.chromium.org/11791006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175348 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 17 insertions, 11 deletions

diff --git a/DEPS b/DEPS
index 8e128c0..5c1273e 100644
--- a/DEPS
+++ b/DEPS
@@ -20,7 +20,7 @@ vars = {
 
   "libjingle_revision": "257",
   "libphonenumber_revision": "456",
-  "libvpx_revision": "173187",
+  "libvpx_revision": "175207",
   "lss_revision": "17",
 
   # These two FFmpeg variables must be updated together.  One is used for SVN
@@ -259,7 +259,7 @@ deps = {
     "/trunk/deps/third_party/libsrtp@174628",
 
   "src/third_party/speex":
-    "/trunk/deps/third_party/speex@160092",
+    "/trunk/deps/third_party/speex@175205",
 
   "src/third_party/yasm/source/patched-yasm":
     "/trunk/deps/third_party/yasm/patched-yasm@167605",
@@ -268,7 +268,7 @@ deps = {
     "/trunk/deps/third_party/libjpeg_turbo@149334",
 
   "src/third_party/flac":
-    "/trunk/deps/third_party/flac@174038",
+    "/trunk/deps/third_party/flac@175206",
 
   "src/third_party/pyftpdlib/src":
     (Var("googlecode_url") % "pyftpdlib") + "/trunk@977",
diff --git a/content/browser/speech/audio_encoder.cc b/content/browser/speech/audio_encoder.cc
index 8eade5a..73bbd41 100644
--- a/content/browser/speech/audio_encoder.cc
+++ b/content/browser/speech/audio_encoder.cc
@@ -10,8 +10,8 @@
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "content/browser/speech/audio_buffer.h"
-#include "third_party/flac/flac.h"
-#include "third_party/speex/speex.h"
+#include "third_party/flac/include/FLAC/stream_encoder.h"
+#include "third_party/speex/include/speex/speex.h"
 
 namespace content {
 namespace {
diff --git a/media/webm/chromeos/webm_encoder.h b/media/webm/chromeos/webm_encoder.h
index 231a0b0..d0e7414 100644
--- a/media/webm/chromeos/webm_encoder.h
+++ b/media/webm/chromeos/webm_encoder.h
@@ -14,7 +14,8 @@
 
 extern "C" {
 #define VPX_CODEC_DISABLE_COMPAT 1
-#include "third_party/libvpx/libvpx.h"
+#include "third_party/libvpx/source/libvpx/vpx/vpx_encoder.h"
+#include "third_party/libvpx/source/libvpx/vpx/vp8cx.h"
 }
 
 class FilePath;
diff --git a/remoting/codec/audio_decoder_speex.cc b/remoting/codec/audio_decoder_speex.cc
index 61b4dbc..7114844 100644
--- a/remoting/codec/audio_decoder_speex.cc
+++ b/remoting/codec/audio_decoder_speex.cc
@@ -11,7 +11,8 @@
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "remoting/proto/audio.pb.h"
-#include "third_party/speex/speex.h"
+#include "third_party/speex/include/speex/speex_callbacks.h"
+#include "third_party/speex/include/speex/speex_stereo.h"
 
 namespace remoting {
 
diff --git a/remoting/codec/audio_encoder_speex.cc b/remoting/codec/audio_encoder_speex.cc
index f9c6c22..3adb366 100644
--- a/remoting/codec/audio_encoder_speex.cc
+++ b/remoting/codec/audio_encoder_speex.cc
@@ -11,7 +11,8 @@
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "remoting/proto/audio.pb.h"
-#include "third_party/speex/speex.h"
+#include "third_party/speex/include/speex/speex_callbacks.h"
+#include "third_party/speex/include/speex/speex_stereo.h"
 
 namespace {
 // A quality of 8 in wide band mode corresponds to 27,800 bits per second.
diff --git a/remoting/codec/video_decoder_vp8.cc b/remoting/codec/video_decoder_vp8.cc
index 1565468..d871542 100644
--- a/remoting/codec/video_decoder_vp8.cc
+++ b/remoting/codec/video_decoder_vp8.cc
@@ -13,7 +13,8 @@
 
 extern "C" {
 #define VPX_CODEC_DISABLE_COMPAT 1
-#include "third_party/libvpx/libvpx.h"
+#include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h"
+#include "third_party/libvpx/source/libvpx/vpx/vp8dx.h"
 }
 
 namespace remoting {
diff --git a/remoting/codec/video_encoder_vp8.cc b/remoting/codec/video_encoder_vp8.cc
index 03758ca..ace549b 100644
--- a/remoting/codec/video_encoder_vp8.cc
+++ b/remoting/codec/video_encoder_vp8.cc
@@ -14,7 +14,8 @@
 
 extern "C" {
 #define VPX_CODEC_DISABLE_COMPAT 1
-#include "third_party/libvpx/libvpx.h"
+#include "third_party/libvpx/source/libvpx/vpx/vpx_encoder.h"
+#include "third_party/libvpx/source/libvpx/vpx/vp8cx.h"
 }
 
 namespace {
diff --git a/webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.cc b/webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.cc
index 2ba718e..6590e6f 100644
--- a/webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.cc
+++ b/webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.cc
@@ -14,7 +14,8 @@
 // backwards compatibility for legacy applications using the library.
 #define VPX_CODEC_DISABLE_COMPAT 1
 extern "C" {
-#include "third_party/libvpx/libvpx.h"
+#include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h"
+#include "third_party/libvpx/source/libvpx/vpx/vp8dx.h"
 }
 
 #include "webkit/media/crypto/ppapi/cdm/content_decryption_module.h"