Merge branch 'rustdesk:master' into master

zhangbo8418 · Dec 30, 2024 · 7623dcb · 7623dcb
2 parents 950ac7f + 98b00cd
commit 7623dcb
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 1 deletion.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/res/vcpkg/ffmpeg/patch/0009-fix-nvenc-reconfigure-blur.patch b/res/vcpkg/ffmpeg/patch/0009-fix-nvenc-reconfigure-blur.patch
@@ -0,0 +1,28 @@
+From bec8d49e75b37806e1cff39c75027860fde0bfa2 Mon Sep 17 00:00:00 2001
+From: 21pages <[email protected]>
+Date: Fri, 27 Dec 2024 08:43:12 +0800
+Subject: [PATCH] fix nvenc reconfigure blur
+
+Signed-off-by: 21pages <[email protected]>
+---
+ libavcodec/nvenc.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c
+index 2cce478be0..f4c559b7ce 100644
+--- a/libavcodec/nvenc.c
++++ b/libavcodec/nvenc.c
+@@ -2741,8 +2741,8 @@ static void reconfig_encoder(AVCodecContext *avctx, const AVFrame *frame)
+         }
+
+         if (reconfig_bitrate) {
+-            params.resetEncoder = 1;
+-            params.forceIDR = 1;
++            params.resetEncoder = 0;
++            params.forceIDR = 0;
+
+             needs_encode_config = 1;
+             needs_reconfig = 1;
+-- 
+2.43.0.windows.1
+
diff --git a/res/vcpkg/ffmpeg/portfile.cmake b/res/vcpkg/ffmpeg/portfile.cmake
@@ -24,6 +24,7 @@ vcpkg_from_github(
     patch/0006-dlopen-libva.patch
     patch/0007-fix-linux-configure.patch
     patch/0008-remove-amf-loop-query.patch
+    patch/0009-fix-nvenc-reconfigure-blur.patch
 )
 
 if(SOURCE_PATH MATCHES " ")