From 3ec84d33dc587c851892ebf30cc11499eb947e15 Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Wed, 24 Sep 2014 06:05:00 +0000 Subject: Move thread_annotations.h to webrtc/base/. R=andresp@webrtc.org, mflodman@webrtc.org BUG= Review URL: https://webrtc-codereview.appspot.com/27579004 git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@7283 4adac7df-926f-26a2-2b94-8c16560cd09d --- media/webrtc/webrtcvideoengine2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'media') diff --git a/media/webrtc/webrtcvideoengine2.h b/media/webrtc/webrtcvideoengine2.h index a1b953b..a19abd5 100644 --- a/media/webrtc/webrtcvideoengine2.h +++ b/media/webrtc/webrtcvideoengine2.h @@ -38,8 +38,8 @@ #include "talk/media/webrtc/webrtcvideoencoderfactory.h" #include "webrtc/base/cpumonitor.h" #include "webrtc/base/scoped_ptr.h" +#include "webrtc/base/thread_annotations.h" #include "webrtc/common_video/interface/i420_video_frame.h" -#include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/transport.h" #include "webrtc/video_receive_stream.h" #include "webrtc/video_renderer.h" -- cgit v1.2.3