]> git.sesse.net Git - nageru/commitdiff
Fix a wrong assertion.
authorSteinar H. Gunderson <steinar+nageru@gunderson.no>
Sat, 2 Oct 2021 14:01:42 +0000 (16:01 +0200)
committerSteinar H. Gunderson <steinar+nageru@gunderson.no>
Sat, 2 Oct 2021 14:01:42 +0000 (16:01 +0200)
nageru/bmusb
nageru/quicksync_encoder.cpp

index 6334dc3fcbd67a757f6065a946a2343185c233fc..327dca2d848e4c4656be1bfb54a2edf2e6587a71 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 6334dc3fcbd67a757f6065a946a2343185c233fc
+Subproject commit 327dca2d848e4c4656be1bfb54a2edf2e6587a71
index eb144ceb2512f70044e5ae55d9b17b6e77ee4135..a094498db1fa4cf1c6044fe71f642abe7af50e28 100644 (file)
@@ -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);
        }