From 20fec7d97dd55b84d3c432584ac7b141ddd0b8ad Mon Sep 17 00:00:00 2001 From: Hendrik Lind Date: Sun, 6 Apr 2025 17:13:04 +0200 Subject: [PATCH 1/5] Update lib.rs --- libobs-encoders/libobs-encoders/src/lib.rs | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/libobs-encoders/libobs-encoders/src/lib.rs b/libobs-encoders/libobs-encoders/src/lib.rs index b93cf3ffd..8b1378917 100644 --- a/libobs-encoders/libobs-encoders/src/lib.rs +++ b/libobs-encoders/libobs-encoders/src/lib.rs @@ -1,14 +1 @@ -pub fn add(left: u64, right: u64) -> u64 { - left + right -} -#[cfg(test)] -mod tests { - use super::*; - - #[test] - fn it_works() { - let result = add(2, 2); - assert_eq!(result, 4); - } -} From db871324cc0bd44d9de6069794ab8a0197f7ffad Mon Sep 17 00:00:00 2001 From: Hendrik Lind Date: Sun, 6 Apr 2025 18:11:02 +0200 Subject: [PATCH 2/5] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5ae21de4e..b1a2f4f01 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Install the tool ```bash cargo install cargo-obs-build ``` - +sadfasd > [!NOTE] > There is now a new bootstrapper that can download and install OBS binaries at runtime, which is useful for distributing applications without requiring users to install OBS separately. See the [OBS Bootstrapper](./libobs-wrapper/README.md#obs-bootstrapper) section for more details. @@ -47,4 +47,4 @@ cargo obs-build target/(debug|release)/deps Below is an example that will record video-only footage of an exclusive fullscreen application. Note that the API is extremely limited right now, but you can already record both video and audio with full control over the output already. If you need more, libobs is exposed. Examples are located in the [examples](./examples) directory. -Documentation is also available for [libobs-sources](./libobs-sources/README.md) or [libobs-wrapper](./libobs-wrapper/README.md). \ No newline at end of file +Documentation is also available for [libobs-sources](./libobs-sources/README.md) or [libobs-wrapper](./libobs-wrapper/README.md). From 627df50bf347108ac01207b94a9e24c60d9c435d Mon Sep 17 00:00:00 2001 From: Hendrik Lind Date: Sun, 6 Apr 2025 18:11:37 +0200 Subject: [PATCH 3/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 04b4b105d..90f471a59 100644 --- a/README.md +++ b/README.md @@ -17,4 +17,4 @@ Compiled Windows DLLs for libobs can be found at https://github.com/joshprk/libo Below is an example that will record video-only footage of an exclusive fullscreen application. Note that the API is extremely limited right now, but you can already record both video and audio with full control over the output already. If you need more, libobs is exposed. -For examples look at [libobs-sources](./libobs-sources/README.md) or the [wrapper](./libobs-wrapper/README.md). \ No newline at end of file +For examples look at [libobs-sources](./libobs-sources/README.md) or the [wrapper](./libobs-wrapper/README.md).sadf From 3a3d303deda2b58137e9ed75a94dd33ec2bf4ebd Mon Sep 17 00:00:00 2001 From: Hendrik Lind Date: Sun, 6 Apr 2025 23:26:27 +0200 Subject: [PATCH 4/5] Update util_uint64.h --- libobs/headers/obs/util/util_uint64.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libobs/headers/obs/util/util_uint64.h b/libobs/headers/obs/util/util_uint64.h index 81f65926d..4d0f4f8b7 100644 --- a/libobs/headers/obs/util/util_uint64.h +++ b/libobs/headers/obs/util/util_uint64.h @@ -21,6 +21,10 @@ #include #endif +#if defined(_MSC_VER) && defined(_M_X64) && (_MSC_VER >= 1920) +#pragma intrinsic(_umul128, _udiv128) +#endif + static inline uint64_t util_mul_div64(uint64_t num, uint64_t mul, uint64_t div) { #if defined(_MSC_VER) && defined(_M_X64) && (_MSC_VER >= 1920) From ba3a9d8926be4bd22153de15677f4ce43498b344 Mon Sep 17 00:00:00 2001 From: Hendrik Lind Date: Sun, 6 Apr 2025 23:37:24 +0200 Subject: [PATCH 5/5] Update util_uint64.h --- libobs/headers/obs/util/util_uint64.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libobs/headers/obs/util/util_uint64.h b/libobs/headers/obs/util/util_uint64.h index 4d0f4f8b7..1dd7b593f 100644 --- a/libobs/headers/obs/util/util_uint64.h +++ b/libobs/headers/obs/util/util_uint64.h @@ -21,13 +21,10 @@ #include #endif -#if defined(_MSC_VER) && defined(_M_X64) && (_MSC_VER >= 1920) -#pragma intrinsic(_umul128, _udiv128) -#endif static inline uint64_t util_mul_div64(uint64_t num, uint64_t mul, uint64_t div) { -#if defined(_MSC_VER) && defined(_M_X64) && (_MSC_VER >= 1920) +#if defined(_MSC_VER) && defined(_M_X64) && (_MSC_VER >= 1920) &&0 unsigned __int64 high; const unsigned __int64 low = _umul128(num, mul, &high); unsigned __int64 rem;