From fa95e8bc618a8106b0a45d5c0745419dee75308b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A1ri=20Tristan=20Helgason?= <kthelgason@webrtc.org>
Date: Wed, 6 May 2020 20:00:53 +0200
Subject: [PATCH] fix nil RTCVideoEncoderSelector case in video encoder
 factory.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug: None
Change-Id: I9ad85c7a8aee9feb24cef7e2f4d29fe8d18310e6
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/174582
Reviewed-by: Zeke Chin <tkchin@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Commit-Queue: Kári Helgason <kthelgason@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31173}
---
 sdk/objc/native/src/objc_video_encoder_factory.mm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sdk/objc/native/src/objc_video_encoder_factory.mm b/sdk/objc/native/src/objc_video_encoder_factory.mm
index 0b53eceb64..b54945f49e 100644
--- a/sdk/objc/native/src/objc_video_encoder_factory.mm
+++ b/sdk/objc/native/src/objc_video_encoder_factory.mm
@@ -202,7 +202,10 @@ std::unique_ptr<VideoEncoder> ObjCVideoEncoderFactory::CreateVideoEncoder(
 std::unique_ptr<VideoEncoderFactory::EncoderSelectorInterface>
     ObjCVideoEncoderFactory::GetEncoderSelector() const {
   if ([encoder_factory_ respondsToSelector:@selector(encoderSelector)]) {
-    return absl::make_unique<ObjcVideoEncoderSelector>([encoder_factory_ encoderSelector]);
+    id<RTC_OBJC_TYPE(RTCVideoEncoderSelector)> selector = [encoder_factory_ encoderSelector];
+    if (selector) {
+      return absl::make_unique<ObjcVideoEncoderSelector>(selector);
+    }
   }
   return nullptr;
 }