From: Steinar H. Gunderson <steinar+nageru@gunderson.no>
Date: Sat, 2 Oct 2021 14:01:42 +0000 (+0200)
Subject: Fix a wrong assertion.
X-Git-Tag: 2.1.0~10
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=58644bea00e8de98276e4acb4e62e892256e3b46;p=nageru

Fix a wrong assertion.
---

diff --git a/nageru/bmusb b/nageru/bmusb
index 6334dc3..327dca2 160000
--- a/nageru/bmusb
+++ b/nageru/bmusb
@@ -1 +1 @@
-Subproject commit 6334dc3fcbd67a757f6065a946a2343185c233fc
+Subproject commit 327dca2d848e4c4656be1bfb54a2edf2e6587a71
diff --git a/nageru/quicksync_encoder.cpp b/nageru/quicksync_encoder.cpp
index eb144ce..a094498 100644
--- a/nageru/quicksync_encoder.cpp
+++ b/nageru/quicksync_encoder.cpp
@@ -1449,12 +1449,9 @@ QuickSyncEncoderImpl::QuickSyncEncoderImpl(const std::string &filename, Resource
 
 	if (global_flags.x264_video_to_http || global_flags.x264_video_to_disk) {
 		assert(x264_http_encoder != nullptr);
-	} else {
-		assert(x264_http_encoder == nullptr);
-	}
-	if (global_flags.x264_separate_disk_encode) {
 		assert(x264_disk_encoder != nullptr);
 	} else {
+		assert(x264_http_encoder == nullptr);
 		assert(x264_disk_encoder == nullptr);
 	}