diff --git a/webrtc/modules/video_coding/BUILD.gn b/webrtc/modules/video_coding/BUILD.gn
index 3f06c4d73e..cab7ad207e 100644
--- a/webrtc/modules/video_coding/BUILD.gn
+++ b/webrtc/modules/video_coding/BUILD.gn
@@ -146,13 +146,6 @@ rtc_static_library("video_coding_utility") {
   ]
 }
 
-# TODO(ehmaldonado): Remove once http://bugs.webrtc.org/8090 is fixed.
-config("webrtc_h264_config") {
-  if (is_clang) {
-    cflags = [ "-Wno-thread-safety-attributes" ]
-  }
-}
-
 rtc_static_library("webrtc_h264") {
   sources = [
     "codecs/h264/h264.cc",
@@ -173,7 +166,6 @@ rtc_static_library("webrtc_h264") {
   ]
 
   if (rtc_use_h264) {
-    configs += [ ":webrtc_h264_config" ]
     defines += [ "WEBRTC_USE_H264" ]
     if (rtc_initialize_ffmpeg) {
       defines += [ "WEBRTC_INITIALIZE_FFMPEG" ]
diff --git a/webrtc/modules/video_coding/codecs/h264/OWNERS b/webrtc/modules/video_coding/codecs/h264/OWNERS
new file mode 100644
index 0000000000..a79fd4a169
--- /dev/null
+++ b/webrtc/modules/video_coding/codecs/h264/OWNERS
@@ -0,0 +1,2 @@
+hbos@webrtc.org
+sprang@webrtc.org
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 a28a841994..290df944bd 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();