From 05e1a1f5709079f62bddeb0f47674ecc305cd843 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Terelius?= <terelius@webrtc.org>
Date: Thu, 5 Sep 2024 10:32:10 +0200
Subject: [PATCH] Explicitly set encoder_context to nullptr in
 SimulcastEncoderAdapter after move.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug: None
Change-Id: Idac2efa73835ff5e1c37e1f19d7d2127c62e5900
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/361642
Commit-Queue: Björn Terelius <terelius@webrtc.org>
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42957}
---
 media/engine/simulcast_encoder_adapter.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media/engine/simulcast_encoder_adapter.cc b/media/engine/simulcast_encoder_adapter.cc
index db36b73002..7d3329f8de 100644
--- a/media/engine/simulcast_encoder_adapter.cc
+++ b/media/engine/simulcast_encoder_adapter.cc
@@ -441,6 +441,7 @@ int SimulcastEncoderAdapter::InitEncode(
         parent, std::move(encoder_context),
         std::make_unique<FramerateController>(stream_codec.maxFramerate),
         stream_idx, stream_codec.width, stream_codec.height, is_paused);
+    encoder_context = nullptr;
   }
 
   // To save memory, don't store encoders that we don't use.