diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-03 17:24:36 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-03 17:24:36 +0000 |
| commit | 5cfa36e1d4d3dced88ab241390733e359f154378 (patch) | |
| tree | 284382e0c6e6eb1b32118cfcbf1dd64176824fac /remoting | |
| parent | 3d2853d9119b49e0c549e075ecd0265e702e2e8d (diff) | |
| download | chromium_src-5cfa36e1d4d3dced88ab241390733e359f154378.zip chromium_src-5cfa36e1d4d3dced88ab241390733e359f154378.tar.gz chromium_src-5cfa36e1d4d3dced88ab241390733e359f154378.tar.bz2 | |
Linux: roll ffmpeg and vpx so that we can build with system vpx
Also change remoting files to use libvpx shim header.
This is upstreaming Gentoo Linux changes.
TBR=scherkus
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/6588123
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76757 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/base/decoder_vp8.cc | 4 | ||||
| -rw-r--r-- | remoting/base/encoder_vp8.cc | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/remoting/base/decoder_vp8.cc b/remoting/base/decoder_vp8.cc index 785382a..615c453 100644 --- a/remoting/base/decoder_vp8.cc +++ b/remoting/base/decoder_vp8.cc @@ -10,9 +10,7 @@ extern "C" { #define VPX_CODEC_DISABLE_COMPAT 1 -#include "third_party/libvpx/source/libvpx/vpx/vpx_codec.h" -#include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h" -#include "third_party/libvpx/source/libvpx/vpx/vp8dx.h" +#include "third_party/libvpx/libvpx.h" } namespace remoting { diff --git a/remoting/base/encoder_vp8.cc b/remoting/base/encoder_vp8.cc index 1d8f8c6..f2db413 100644 --- a/remoting/base/encoder_vp8.cc +++ b/remoting/base/encoder_vp8.cc @@ -13,9 +13,7 @@ extern "C" { #define VPX_CODEC_DISABLE_COMPAT 1 -#include "third_party/libvpx/source/libvpx/vpx/vpx_codec.h" -#include "third_party/libvpx/source/libvpx/vpx/vpx_encoder.h" -#include "third_party/libvpx/source/libvpx/vpx/vp8cx.h" +#include "third_party/libvpx/libvpx.h" } namespace { |