From 58644bea00e8de98276e4acb4e62e892256e3b46 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sat, 2 Oct 2021 16:01:42 +0200 Subject: [PATCH] Fix a wrong assertion. --- nageru/bmusb | 2 +- nageru/quicksync_encoder.cpp | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) 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); } -- 2.39.2