diff --git a/README.md b/README.md index 5ae21de4e..bcd10d0d3 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,5 @@ 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). + 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); - } -} diff --git a/libobs/headers/obs/util/util_uint64.h b/libobs/headers/obs/util/util_uint64.h index a7cfa075a..856bbbcfb 100644 --- a/libobs/headers/obs/util/util_uint64.h +++ b/libobs/headers/obs/util/util_uint64.h @@ -20,9 +20,14 @@ #include #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) && 0 + + + unsigned __int64 high; const unsigned __int64 low = _umul128(num, mul, &high); unsigned __int64 rem;