From 1d995fb2bc2cb4198d3239d99328d9d851c685de Mon Sep 17 00:00:00 2001
From: Anders Carlsson <andersc@webrtc.org>
Date: Wed, 11 Jul 2018 10:28:59 +0200
Subject: [PATCH] Fix null check in CricketToWebRtcVideoDecoderFactory

https://webrtc-review.googlesource.com/c/src/+/83729 introduced a bug,
this fixes it.

Bug: webrtc:7925
Change-Id: I9c8739f4e12b2c38586fa50714c9b8a06a49687f
Reviewed-on: https://webrtc-review.googlesource.com/88122
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Anders Carlsson <andersc@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23927}
---
 media/engine/convert_legacy_video_factory.cc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/media/engine/convert_legacy_video_factory.cc b/media/engine/convert_legacy_video_factory.cc
index 075ef91c58..e6447bcc9f 100644
--- a/media/engine/convert_legacy_video_factory.cc
+++ b/media/engine/convert_legacy_video_factory.cc
@@ -186,8 +186,11 @@ class CricketToWebRtcDecoderFactory : public webrtc::VideoDecoderFactory {
 
   std::unique_ptr<webrtc::VideoDecoder> CreateVideoDecoder(
       const webrtc::SdpVideoFormat& format) override {
-    return CreateScopedVideoDecoder(external_decoder_factory_.get(),
-                                    VideoCodec(format), {});
+    if (external_decoder_factory_ != nullptr) {
+      return CreateScopedVideoDecoder(external_decoder_factory_.get(),
+                                      VideoCodec(format), {});
+    }
+    return nullptr;
   }
 
   std::vector<webrtc::SdpVideoFormat> GetSupportedFormats() const override {