Merge branch 'rustdesk:master' into master

zhangbo8418 · Jan 2, 2025 · 3033fc8 · 3033fc8
2 parents abd1f2b + 40999c3
commit 3033fc8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/libs/scrap/src/common/hwcodec.rs b/libs/scrap/src/common/hwcodec.rs
@@ -193,7 +193,7 @@ impl EncoderApi for HwRamEncoder {
     }
 
     fn support_abr(&self) -> bool {
-        ["qsv", "vaapi"].iter().all(|&x| !self.config.name.contains(x))
+        ["vaapi"].iter().all(|&x| !self.config.name.contains(x))
     }
 
     fn support_changing_quality(&self) -> bool {

diff --git a/res/vcpkg/ffmpeg/patch/0004-videotoolbox-changing-bitrate.patch b/res/vcpkg/ffmpeg/patch/0004-videotoolbox-changing-bitrate.patch
@@ -58,7 +58,7 @@ index da7b291b03..3c866177f5 100644
 +                int status = VTSessionSetProperty(vtctx->session,
 +                                            kVTCompressionPropertyKey_AverageBitRate,
 +                                            bit_rate_num);
-+                if (!status) {
++                if (status) {
 +                    av_log(avctx, AV_LOG_ERROR, "Error: cannot set average bit rate: %d\n", status);
 +                }
 +            }