summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-07 17:03:04 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-07 17:03:04 +0000
commitd6ab6e85a41237121a28f51dd3f38135df48bf5a (patch)
treefb6937cc3c62e26dd5fb246d86b55f1f10841ea4 /remoting
parente4f0c10392960d73974b6c91e41dd9ffec41a64e (diff)
downloadchromium_src-d6ab6e85a41237121a28f51dd3f38135df48bf5a.zip
chromium_src-d6ab6e85a41237121a28f51dd3f38135df48bf5a.tar.gz
chromium_src-d6ab6e85a41237121a28f51dd3f38135df48bf5a.tar.bz2
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
Diffstat (limited to 'remoting')
-rw-r--r--remoting/codec/audio_decoder_speex.cc3
-rw-r--r--remoting/codec/audio_encoder_speex.cc3
-rw-r--r--remoting/codec/video_decoder_vp8.cc3
-rw-r--r--remoting/codec/video_encoder_vp8.cc3
4 files changed, 8 insertions, 4 deletions
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 {