zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Update includes for webrtc/{base => rtc_base} rename (2/3)"

Browse Source 
This reverts commit c3771cc4d37f5573fe53b7c7cff295a4f0f9560f.
(breaks downstream internal project)

BUG=webrtc:7634
NOTRY=True
NOPRESUBMIT=True

Review-Url: https://codereview.webrtc.org/2972463002 .
Cr-Commit-Position: refs/heads/master@{#18873}
This commit is contained in:
Henrik Kjellander
2017-07-01 16:48:15 +02:00
parent dca1e09db7
commit a80c16a67c
631 changed files with 1686 additions and 1684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.cc
View File

@ -12,9 +12,9 @@
#include "libyuv/convert.h"
#include "webrtc/api/video/i420_buffer.h"
#include "webrtc/base/checks.h"
#include "webrtc/base/logging.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/rtc_base/checks.h"
#include "webrtc/rtc_base/logging.h"
namespace webrtc {

2
webrtc/sdk/objc/Framework/Classes/Video/objcvideotracksource.h
View File

@ -12,8 +12,8 @@
#define WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEO_OBJCVIDEOTRACKSOURCE_H_
#include "WebRTC/RTCMacros.h"
#include "webrtc/base/timestampaligner.h"
#include "webrtc/media/base/adaptedvideotracksource.h"
#include "webrtc/rtc_base/timestampaligner.h"
RTC_FWD_DECL_OBJC_CLASS(RTCVideoFrame);