From a59f6c4e506cf7b1142e60f2d5aa7143dc0139b7 Mon Sep 17 00:00:00 2001
From: Paul Hindt <paulh@aja.com>
Date: Tue, 18 Jan 2022 04:28:37 -0800
Subject: [PATCH] aja: Fix crash when capture thread is reset

---
 plugins/aja/aja-source.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/aja/aja-source.cpp b/plugins/aja/aja-source.cpp
index d458e6856..ec5d564e9 100644
--- a/plugins/aja/aja-source.cpp
+++ b/plugins/aja/aja-source.cpp
@@ -187,6 +187,8 @@ void AJASource::CaptureThread(AJAThread *thread, void *data)
 	}
 
 	auto sourceProps = ajaSource->GetSourceProps();
+	ajaSource->ResetVideoBuffer(sourceProps.videoFormat,
+				    sourceProps.pixelFormat);
 	auto inputSource = sourceProps.InitialInputSource();
 	auto channel = sourceProps.Channel();
 	auto audioSystem = sourceProps.AudioSystem();
@@ -1028,8 +1030,6 @@ static void aja_source_update(void *data, obs_data_t *settings)
 	}
 
 	ajaSource->SetSourceProps(want_props);
-	ajaSource->ResetVideoBuffer(want_props.videoFormat,
-				    want_props.pixelFormat);
 	aja::Routing::StartSourceAudio(want_props, card);
 	card->SetReference(NTV2_REFERENCE_FREERUN);
 	ajaSource->Activate(true);