Index: webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc |
diff --git a/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc b/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc |
index a28a841994885fa0935e765f44781d0b41a1660b..290df944bde45d5b9d5c3e96848f1b5f16203283 100644 |
--- a/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc |
+++ b/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc |
@@ -50,9 +50,10 @@ rtc::CriticalSection ffmpeg_init_lock; |
bool ffmpeg_initialized = false; |
// Called by FFmpeg to do mutex operations if initialized using |
-// |InitializeFFmpeg|. |
+// |InitializeFFmpeg|. Disabling thread safety analysis because void** does not |
+// play nicely with thread_annotations.h macros. |
int LockManagerOperation(void** lock, AVLockOp op) |
- EXCLUSIVE_LOCK_FUNCTION() UNLOCK_FUNCTION() { |
+ NO_THREAD_SAFETY_ANALYSIS { |
switch (op) { |
case AV_LOCK_CREATE: |
*lock = new rtc::CriticalSection(); |