From: Steinar H. Gunderson <steinar+nageru@gunderson.no>
Date: Mon, 1 Jun 2020 08:12:00 +0000 (+0200)
Subject: Fix a crash on startup with MJPEG software encoding.
X-Git-Tag: 2.0.0~17
X-Git-Url: https://git.sesse.net/?p=nageru;a=commitdiff_plain;h=2dc38f684491f30639665a02e538f9a1e32d77ee

Fix a crash on startup with MJPEG software encoding.
---

diff --git a/nageru/mjpeg_encoder.cpp b/nageru/mjpeg_encoder.cpp
index 26eb9a8..a60f729 100644
--- a/nageru/mjpeg_encoder.cpp
+++ b/nageru/mjpeg_encoder.cpp
@@ -234,10 +234,9 @@ MJPEGEncoder::MJPEGEncoder(HTTPD *httpd, const string &va_display)
 		fprintf(stderr, "Could not initialize VA-API for MJPEG encoding: %s. JPEGs will be encoded in software if needed.\n", error.c_str());
 	}
 
-	va_pool.reset(new VAResourcePool(va_dpy->va_dpy, uyvy_format, nv12_format, config_id_422, config_id_420, /*with_data_buffer=*/true));
-
 	encoder_thread = thread(&MJPEGEncoder::encoder_thread_func, this);
 	if (va_dpy != nullptr) {
+		va_pool.reset(new VAResourcePool(va_dpy->va_dpy, uyvy_format, nv12_format, config_id_422, config_id_420, /*with_data_buffer=*/true));
 		va_receiver_thread = thread(&MJPEGEncoder::va_receiver_thread_func, this);
 	}