H264: Don't disable compiler warning by using NO_THREAD_SAFETY_ANALYSIS.

webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  *
  */
@@ skipping 32 matching lines @@
   kH264DecoderEventError = 1,
   kH264DecoderEventMax = 16,
 };
 
 #if defined(WEBRTC_INITIALIZE_FFMPEG)
 
 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();
       return 0;
     case AV_LOCK_OBTAIN:
       static_cast<rtc::CriticalSection*>(*lock)->Enter();
       return 0;
     case AV_LOCK_RELEASE:
       static_cast<rtc::CriticalSection*>(*lock)->Leave();
       return 0;
@@ skipping 350 matching lines @@
 void H264DecoderImpl::ReportError() {
   if (has_reported_error_)
     return;
   RTC_HISTOGRAM_ENUMERATION("WebRTC.Video.H264DecoderImpl.Event",
                             kH264DecoderEventError,
                             kH264DecoderEventMax);
   has_reported_error_ = true;
 }
 
 }  // namespace webrtc