diff options
| author | pbos@webrtc.org <pbos@webrtc.org> | 2014-12-15 09:41:24 +0000 |
|---|---|---|
| committer | pbos@webrtc.org <pbos@webrtc.org> | 2014-12-15 09:41:24 +0000 |
| commit | 788acd17adf6b3d605b5ea66cf394eb81fc086a9 (patch) | |
| tree | 2f08a4f673f34c31cfe1b2ffcf0acabae50b1563 /webrtc/modules/audio_processing/audio_processing_impl_unittest.cc | |
| parent | fb108b5a28a538862a4157e17de795426d86af1e (diff) | |
| download | webrtc-788acd17adf6b3d605b5ea66cf394eb81fc086a9.tar.gz | |
Merge audio_processing changes.
R=aluebs@webrtc.org, bjornv@webrtc.org
BUG=
Review URL: https://webrtc-codereview.appspot.com/32769004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7893 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc/modules/audio_processing/audio_processing_impl_unittest.cc')
| -rw-r--r-- | webrtc/modules/audio_processing/audio_processing_impl_unittest.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/webrtc/modules/audio_processing/audio_processing_impl_unittest.cc b/webrtc/modules/audio_processing/audio_processing_impl_unittest.cc index 0957617575..f4c36d0009 100644 --- a/webrtc/modules/audio_processing/audio_processing_impl_unittest.cc +++ b/webrtc/modules/audio_processing/audio_processing_impl_unittest.cc @@ -27,7 +27,9 @@ class MockInitialize : public AudioProcessingImpl { } MOCK_METHOD0(InitializeLocked, int()); - int RealInitializeLocked() { return AudioProcessingImpl::InitializeLocked(); } + int RealInitializeLocked() NO_THREAD_SAFETY_ANALYSIS { + return AudioProcessingImpl::InitializeLocked(); + } }; TEST(AudioProcessingImplTest, AudioParameterChangeTriggersInit) { |