diff options
| author | johannkoenig@chromium.org <johannkoenig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-04 17:30:39 +0000 |
|---|---|---|
| committer | johannkoenig@chromium.org <johannkoenig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-04 17:30:39 +0000 |
| commit | bfdb6ba8387970ebfd2ca39d054ccc0deddcb7c6 (patch) | |
| tree | 9f3cbc7de8e8d6fb1dcad0f347925c3f27eed2ff /media | |
| parent | 2901c8c9c418cb8a271d9eac1ede81edf9ef15e4 (diff) | |
| download | chromium_src-bfdb6ba8387970ebfd2ca39d054ccc0deddcb7c6.zip chromium_src-bfdb6ba8387970ebfd2ca39d054ccc0deddcb7c6.tar.gz chromium_src-bfdb6ba8387970ebfd2ca39d054ccc0deddcb7c6.tar.bz2 | |
Roll libvpx 228256:232686
Pull latest version from upstream. This had to be broken up across several
changes. The first has the commit message:
https://codereview.chromium.org/55493002/
Remove AVX code until we update the gyp files:
https://codereview.chromium.org/48903015/
libmkv has moved to third_party/libmkv:
https://codereview.chromium.org/54373014/
media/webm/chromeos/webm_encoder.cc and
media/webm/chromeon/ebml_writer.cc pull from this location
as well and needs to be updated.
The last roll attempt failed because we introduced a new textrel.
Fixed upstream and cherry-picked here:
https://codereview.chromium.org/49023003
R=fischman@chromium.org, tomfinegan@chromium.org, fischman, tomfinegan
Review URL: https://codereview.chromium.org/57063005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232721 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/webm/chromeos/ebml_writer.cc | 2 | ||||
| -rw-r--r-- | media/webm/chromeos/webm_encoder.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/media/webm/chromeos/ebml_writer.cc b/media/webm/chromeos/ebml_writer.cc index 5c5f07d..84a9760 100644 --- a/media/webm/chromeos/ebml_writer.cc +++ b/media/webm/chromeos/ebml_writer.cc @@ -7,7 +7,7 @@ #include "media/base/media_export.h" extern "C" { -#include "third_party/libvpx/source/libvpx/libmkv/EbmlWriter.h" +#include "third_party/libvpx/source/libvpx/third_party/libmkv/EbmlWriter.h" EbmlGlobal::EbmlGlobal() { } diff --git a/media/webm/chromeos/webm_encoder.cc b/media/webm/chromeos/webm_encoder.cc index af4d871..da1f176 100644 --- a/media/webm/chromeos/webm_encoder.cc +++ b/media/webm/chromeos/webm_encoder.cc @@ -16,8 +16,8 @@ extern "C" { // Getting the right degree of C compatibility has been a constant struggle. // - Stroustrup, C++ Report, 12(7), July/August 2000. #define private priv -#include "third_party/libvpx/source/libvpx/libmkv/EbmlIDs.h" -#include "third_party/libvpx/source/libvpx/libmkv/EbmlWriter.h" +#include "third_party/libvpx/source/libvpx/third_party/libmkv/EbmlIDs.h" +#include "third_party/libvpx/source/libvpx/third_party/libmkv/EbmlWriter.h" #undef private } |