diff --git a/api/video_codecs/libaom_av1_encoder_factory.cc b/api/video_codecs/libaom_av1_encoder_factory.cc
index 29c4eb6eda..5c950c7a97 100644
--- a/api/video_codecs/libaom_av1_encoder_factory.cc
+++ b/api/video_codecs/libaom_av1_encoder_factory.cc
@@ -810,11 +810,13 @@ std::map<std::string, std::string> LibaomAv1EncoderFactory::CodecSpecifics()
   return {};
 }
 
+// clang-format off
+// The formater and cpplint have conflicting ideas.
 VideoEncoderFactoryInterface::Capabilities
 LibaomAv1EncoderFactory::GetEncoderCapabilities() const {
   return {
-      .prediction_constraints =
-          {.num_buffers = kNumBuffers,
+      .prediction_constraints = {
+           .num_buffers = kNumBuffers,
            .max_references = kMaxReferences,
            .max_temporal_layers = kMaxTemporalLayers,
            .buffer_space_type = VideoEncoderFactoryInterface::Capabilities::
@@ -834,14 +836,16 @@ LibaomAv1EncoderFactory::GetEncoderCapabilities() const {
           },
       .encoding_formats = {{.sub_sampling = EncodingFormat::k420,
                             .bit_depth = 8}},
-      .rate_control =
-          {.qp_range = {0, kMaxQp},
+      .rate_control = {
+           .qp_range = {0, kMaxQp},
            .rc_modes = {VideoEncoderFactoryInterface::RateControlMode::kCbr,
                         VideoEncoderFactoryInterface::RateControlMode::kCqp}},
-      .performance = {.min_max_effort_level = {kMinEffortLevel,
+      .performance = {.encode_on_calling_thread = true,
+                      .min_max_effort_level = {kMinEffortLevel,
                                                kMaxEffortLevel}},
   };
 }
+// clang-format on
 
 std::unique_ptr<VideoEncoderInterface> LibaomAv1EncoderFactory::CreateEncoder(
     const StaticEncoderSettings& settings,
diff --git a/api/video_codecs/video_encoder_factory_interface.h b/api/video_codecs/video_encoder_factory_interface.h
index 63b21d4ce0..67ca42a81b 100644
--- a/api/video_codecs/video_encoder_factory_interface.h
+++ b/api/video_codecs/video_encoder_factory_interface.h
@@ -70,6 +70,7 @@ class VideoEncoderFactoryInterface {
     } rate_control;
 
     struct Performance {
+      bool encode_on_calling_thread;
       std::pair<int, int> min_max_effort_level;
     } performance;
   };