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 | 38344ed2806c8fed60d67d280ca44c32e36707c0 (patch) | |
tree | 26df876f429848b378561335020a61ec6c6a31a5 /webrtc/modules/audio_coding/neteq/neteq_impl.h | |
parent | 8166faeff3a1549c29a205b3a4f840b9b544c973 (diff) | |
download | webrtc-38344ed2806c8fed60d67d280ca44c32e36707c0.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@7283 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc/modules/audio_coding/neteq/neteq_impl.h')
-rw-r--r-- | webrtc/modules/audio_coding/neteq/neteq_impl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webrtc/modules/audio_coding/neteq/neteq_impl.h b/webrtc/modules/audio_coding/neteq/neteq_impl.h index d3dff185a0..cfe6a402fe 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_impl.h +++ b/webrtc/modules/audio_coding/neteq/neteq_impl.h @@ -14,6 +14,7 @@ #include <vector> #include "webrtc/base/constructormagic.h" +#include "webrtc/base/thread_annotations.h" #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/modules/audio_coding/neteq/defines.h" #include "webrtc/modules/audio_coding/neteq/interface/neteq.h" @@ -22,7 +23,6 @@ #include "webrtc/modules/audio_coding/neteq/rtcp.h" #include "webrtc/modules/audio_coding/neteq/statistics_calculator.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/thread_annotations.h" #include "webrtc/typedefs.h" namespace webrtc { |