| commit | 38344ed2806c8fed60d67d280ca44c32e36707c0 | [log] [tgz] |
|---|---|---|
| author | pbos@webrtc.org <pbos@webrtc.org> | Wed Sep 24 06:05:00 2014 +0000 |
| committer | pbos@webrtc.org <pbos@webrtc.org> | Wed Sep 24 06:05:00 2014 +0000 |
| tree | 26df876f429848b378561335020a61ec6c6a31a5 | |
| parent | 8166faeff3a1549c29a205b3a4f840b9b544c973 [diff] [blame] |
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@7283 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/video_coding/main/source/timing.h b/webrtc/modules/video_coding/main/source/timing.h index 116639e..bb44a93 100644 --- a/webrtc/modules/video_coding/main/source/timing.h +++ b/webrtc/modules/video_coding/main/source/timing.h
@@ -11,9 +11,9 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_TIMING_H_ #define WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_TIMING_H_ +#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/video_coding/main/source/codec_timer.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/typedefs.h" namespace webrtc {