From b2d29bd2feb49f4dd1e3ba55f95197fe8a46b9bc Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Tue, 4 Jun 2013 23:53:48 +0000 Subject: [PATCH] Restore relative include paths to libyuv. Required in order to use an externally compiled libyuv. Removed in https://code.google.com/p/webrtc/source/detail?r=4167 TBR=tnakamura Review URL: https://webrtc-codereview.appspot.com/1611005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4180 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/common_video/jpeg/jpeg.cc | 8 +++++--- webrtc/common_video/libyuv/scaler.cc | 3 ++- webrtc/common_video/libyuv/webrtc_libyuv.cc | 3 ++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/webrtc/common_video/jpeg/jpeg.cc b/webrtc/common_video/jpeg/jpeg.cc index e8a23af52d..18fed3a56a 100644 --- a/webrtc/common_video/jpeg/jpeg.cc +++ b/webrtc/common_video/jpeg/jpeg.cc @@ -9,14 +9,16 @@ */ #if defined(WIN32) - #include +#include #endif #include #include #include -#include "third_party/libyuv/include/libyuv.h" -#include "third_party/libyuv/include/libyuv/mjpeg_decoder.h" +// NOTE(ajm): Path provided by gyp. +#include "libyuv.h" // NOLINT +#include "libyuv/mjpeg_decoder.h" // NOLINT + #include "webrtc/common_video/jpeg/data_manager.h" #include "webrtc/common_video/jpeg/include/jpeg.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" diff --git a/webrtc/common_video/libyuv/scaler.cc b/webrtc/common_video/libyuv/scaler.cc index 2c2418be42..7d8d92161c 100644 --- a/webrtc/common_video/libyuv/scaler.cc +++ b/webrtc/common_video/libyuv/scaler.cc @@ -10,7 +10,8 @@ #include "webrtc/common_video/libyuv/include/scaler.h" -#include "third_party/libyuv/include/libyuv.h" +// NOTE(ajm): Path provided by gyp. +#include "libyuv.h" // NOLINT namespace webrtc { diff --git a/webrtc/common_video/libyuv/webrtc_libyuv.cc b/webrtc/common_video/libyuv/webrtc_libyuv.cc index ba23f9bc66..e8181ecf47 100644 --- a/webrtc/common_video/libyuv/webrtc_libyuv.cc +++ b/webrtc/common_video/libyuv/webrtc_libyuv.cc @@ -13,7 +13,8 @@ #include #include -#include "third_party/libyuv/include/libyuv.h" +// NOTE(ajm): Path provided by gyp. +#include "libyuv.h" // NOLINT namespace webrtc {