diff options
| author | johannkoenig <johannkoenig@google.com> | 2016-03-02 05:54:31 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-02 13:55:33 +0000 |
| commit | 8cdf034791388299f18fba186f2941313320b706 (patch) | |
| tree | 48c9929b48abb9d2a691b14c3e401b5c504b9e30 /remoting/codec | |
| parent | d8f28037ba276d37296c153ee78346af5e190f4e (diff) | |
| download | chromium_src-8cdf034791388299f18fba186f2941313320b706.zip chromium_src-8cdf034791388299f18fba186f2941313320b706.tar.gz chromium_src-8cdf034791388299f18fba186f2941313320b706.tar.bz2 | |
Move libvpx_new to libvpx
The move to libvpx_new happened before M47 (landed in 2524, M47 branch was 2526):
crbug.com/481034
https://codereview.chromium.org/1323333002
Clients which try to transition directly between the tree after this change and before the previous move will end up in a very broken state.
Now it is 6 months later and M48 is stable so is unlikely that a client would check out the old code at all, much less try to transition directly between the two versions.
Leave a compatibility layer for targets which need to be updated out of band (webrtc, libyuv)
Review URL: https://codereview.chromium.org/1734613003
Cr-Commit-Position: refs/heads/master@{#378739}
Diffstat (limited to 'remoting/codec')
| -rw-r--r-- | remoting/codec/BUILD.gn | 2 | ||||
| -rw-r--r-- | remoting/codec/scoped_vpx_codec.cc | 2 | ||||
| -rw-r--r-- | remoting/codec/video_decoder_vpx.cc | 4 | ||||
| -rw-r--r-- | remoting/codec/video_encoder_vpx.cc | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/remoting/codec/BUILD.gn b/remoting/codec/BUILD.gn index 4a2cd73..d08d83c 100644 --- a/remoting/codec/BUILD.gn +++ b/remoting/codec/BUILD.gn @@ -16,7 +16,7 @@ source_set("codec") { "//media", "//media:shared_memory_support", "//remoting/proto", - "//third_party/libvpx_new", + "//third_party/libvpx", "//third_party/libyuv", "//third_party/opus", "//third_party/webrtc/modules/desktop_capture:primitives", diff --git a/remoting/codec/scoped_vpx_codec.cc b/remoting/codec/scoped_vpx_codec.cc index dd5c739..dda986e 100644 --- a/remoting/codec/scoped_vpx_codec.cc +++ b/remoting/codec/scoped_vpx_codec.cc @@ -8,7 +8,7 @@ extern "C" { #define VPX_CODEC_DISABLE_COMPAT 1 -#include "third_party/libvpx_new/source/libvpx/vpx/vpx_codec.h" +#include "third_party/libvpx/source/libvpx/vpx/vpx_codec.h" } namespace remoting { diff --git a/remoting/codec/video_decoder_vpx.cc b/remoting/codec/video_decoder_vpx.cc index 4d27955..b784a9e 100644 --- a/remoting/codec/video_decoder_vpx.cc +++ b/remoting/codec/video_decoder_vpx.cc @@ -17,8 +17,8 @@ extern "C" { #define VPX_CODEC_DISABLE_COMPAT 1 -#include "third_party/libvpx_new/source/libvpx/vpx/vp8dx.h" -#include "third_party/libvpx_new/source/libvpx/vpx/vpx_decoder.h" +#include "third_party/libvpx/source/libvpx/vpx/vp8dx.h" +#include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h" } namespace remoting { diff --git a/remoting/codec/video_encoder_vpx.cc b/remoting/codec/video_encoder_vpx.cc index 2a5894d..ea84859 100644 --- a/remoting/codec/video_encoder_vpx.cc +++ b/remoting/codec/video_encoder_vpx.cc @@ -18,8 +18,8 @@ extern "C" { #define VPX_CODEC_DISABLE_COMPAT 1 -#include "third_party/libvpx_new/source/libvpx/vpx/vp8cx.h" -#include "third_party/libvpx_new/source/libvpx/vpx/vpx_encoder.h" +#include "third_party/libvpx/source/libvpx/vpx/vp8cx.h" +#include "third_party/libvpx/source/libvpx/vpx/vpx_encoder.h" } namespace remoting { |