diff options
| author | pbos@webrtc.org <pbos@webrtc.org> | 2014-09-24 06:05:00 +0000 |
|---|---|---|
| committer | pbos@webrtc.org <pbos@webrtc.org> | 2014-09-24 06:05:00 +0000 |
| commit | 3ec84d33dc587c851892ebf30cc11499eb947e15 (patch) | |
| tree | 751fc88063e8511642ce2d8a7e64914549a5c1c1 | |
| parent | 56dcc5b4f1a06cc282500e6e9b80f71fbb88c115 (diff) | |
| download | talk-3ec84d33dc587c851892ebf30cc11499eb947e15.tar.gz | |
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
| -rw-r--r-- | media/webrtc/webrtcvideoengine2.h | 2 |
1 files changed, 1 insertions, 1 deletions
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" |