diff options
| author | johannkoenig@chromium.org <johannkoenig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-01 22:49:46 +0000 |
|---|---|---|
| committer | johannkoenig@chromium.org <johannkoenig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-01 22:49:46 +0000 |
| commit | 0ba07529c2ceac7906ad223dddf2ea0ef1151126 (patch) | |
| tree | f7d43c99eed0fe27a80c8bdb521716b0d316fa6d /media/webm | |
| parent | 2ad08f5557025c0b2a80ea1a0f3035a5611ff397 (diff) | |
| download | chromium_src-0ba07529c2ceac7906ad223dddf2ea0ef1151126.zip chromium_src-0ba07529c2ceac7906ad223dddf2ea0ef1151126.tar.gz chromium_src-0ba07529c2ceac7906ad223dddf2ea0ef1151126.tar.bz2 | |
Update libvpx
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.
R=fischman@chromium.org, tomfinegan@chromium.org
Review URL: https://codereview.chromium.org/54333009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232493 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/webm')
| -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 } |