From 79ada18b49fbdc2e36a319f9cb0911b089d16152 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Mon, 28 Oct 2024 23:54:50 -0500 Subject: [PATCH 1/2] fix(nvenc): disable filler data in AV1 bitstream (#3336) --- src/video.cpp | 1 + third-party/build-deps | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/video.cpp b/src/video.cpp index 3824c295..ecd92e25 100644 --- a/src/video.cpp +++ b/src/video.cpp @@ -513,6 +513,7 @@ namespace video { { "forced-idr"s, 1 }, { "zerolatency"s, 1 }, { "surfaces"s, 1 }, + { "filler_data"s, false }, { "preset"s, &config::video.nv_legacy.preset }, { "tune"s, NV_ENC_TUNING_INFO_ULTRA_LOW_LATENCY }, { "rc"s, NV_ENC_PARAMS_RC_CBR }, diff --git a/third-party/build-deps b/third-party/build-deps index edbc8c92..f8a2a112 160000 --- a/third-party/build-deps +++ b/third-party/build-deps @@ -1 +1 @@ -Subproject commit edbc8c92611cdd51904f778df5e26c4de0d3fdd4 +Subproject commit f8a2a1128eeeae2ca2ed64fd64604a529e24a682 From ca40cfd268d6aff6b871dc8ee538ec409c6451c1 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Tue, 29 Oct 2024 19:03:37 -0500 Subject: [PATCH 2/2] fix(openssl): fix build with OPENSSL_NO_DEPRECATED (#3339) --- src/crypto.cpp | 1 + src/nvhttp.cpp | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/crypto.cpp b/src/crypto.cpp index b16ab08a..2b30a3bc 100644 --- a/src/crypto.cpp +++ b/src/crypto.cpp @@ -4,6 +4,7 @@ */ #include "crypto.h" #include +#include namespace crypto { using asn1_string_t = util::safe_ptr; diff --git a/src/nvhttp.cpp b/src/nvhttp.cpp index fbdbd051..ea9248e7 100644 --- a/src/nvhttp.cpp +++ b/src/nvhttp.cpp @@ -1033,7 +1033,13 @@ namespace nvhttp { // Verify certificates after establishing connection https_server.verify = [add_cert](SSL *ssl) { - crypto::x509_t x509 { SSL_get_peer_certificate(ssl) }; + crypto::x509_t x509 { +#if OPENSSL_VERSION_MAJOR >= 3 + SSL_get1_peer_certificate(ssl) +#else + SSL_get_peer_certificate(ssl) +#endif + }; if (!x509) { BOOST_LOG(info) << "unknown -- denied"sv; return 0;