From 0921d1e5c1021416e005c605f26cf8cf2f35bd1a Mon Sep 17 00:00:00 2001
From: Peter Kasting <pkasting@chromium.org>
Date: Mon, 23 May 2022 18:04:07 +0000
Subject: [PATCH] C++20 fixes.

ABSL_CONST_INIT must be on definitions, not just declarations.

Bug: chromium:1284275
Change-Id: If57064ab9417df38f770c59e50be93a104748b72
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/263282
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Commit-Queue: Rasmus Brandt <brandtr@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36994}
---
 modules/video_coding/codecs/av1/libaom_av1_decoder_absent.cc    | 2 +-
 modules/video_coding/codecs/av1/libaom_av1_encoder_supported.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/video_coding/codecs/av1/libaom_av1_decoder_absent.cc b/modules/video_coding/codecs/av1/libaom_av1_decoder_absent.cc
index b97b68b33f..1b387d17ed 100644
--- a/modules/video_coding/codecs/av1/libaom_av1_decoder_absent.cc
+++ b/modules/video_coding/codecs/av1/libaom_av1_decoder_absent.cc
@@ -15,7 +15,7 @@
 
 namespace webrtc {
 
-const bool kIsLibaomAv1DecoderSupported = false;
+ABSL_CONST_INIT const bool kIsLibaomAv1DecoderSupported = false;
 
 std::unique_ptr<VideoDecoder> CreateLibaomAv1Decoder() {
   return nullptr;
diff --git a/modules/video_coding/codecs/av1/libaom_av1_encoder_supported.cc b/modules/video_coding/codecs/av1/libaom_av1_encoder_supported.cc
index 900eb137af..97895e270f 100644
--- a/modules/video_coding/codecs/av1/libaom_av1_encoder_supported.cc
+++ b/modules/video_coding/codecs/av1/libaom_av1_encoder_supported.cc
@@ -20,7 +20,7 @@ std::unique_ptr<VideoEncoder> CreateLibaomAv1EncoderIfSupported() {
   return CreateLibaomAv1Encoder();
 }
 #else
-const bool kIsLibaomAv1EncoderSupported = false;
+ABSL_CONST_INIT const bool kIsLibaomAv1EncoderSupported = false;
 std::unique_ptr<VideoEncoder> CreateLibaomAv1EncoderIfSupported() {
   return nullptr;
 }