merge fix

stream-labs · Nov 15, 2023 · bb784c8 · bb784c8
2 parents 66cfeba + 8ec0870
commit bb784c8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/main-streamlabs.yml b/.github/workflows/main-streamlabs.yml
@@ -117,7 +117,7 @@ jobs:
       OS_TAG: "windows64"
       CEF_VERSION: 5060
       CEF_REVISION: v3
-      WIN_DEPS_VERSION: windows-deps-2022-08-02-x64-sl.1
+      WIN_DEPS_VERSION: windows-deps-2023-08-28s7-x64
       GRPC_VERSION: v1.47.0
       CMakeGenerator: Visual Studio 17 2022
       VLC_VERSION: vlc_3.0.0-git

diff --git a/libobs/obs.c b/libobs/obs.c
@@ -3695,7 +3695,7 @@ bool start_gpu_encode(obs_encoder_t *encoder)
 	     obs_encoder_get_name(encoder), obs_encoder_get_id(encoder),
 	     encoder);
 
-	struct obs_core_video_mix *video = encoder->video;
+	struct obs_core_video_mix *video = get_mix_for_video(encoder->media);
 	bool success = true;
 
 	obs_enter_graphics();

diff --git a/plugins/obs-browser b/plugins/obs-browser
+29 −26		browser-app.cpp
+2 −2		browser-app.hpp
+1 −1		browser-client.cpp
+9 −10		browser-mac.h
+0 −3		data/locale/gl-ES.ini
+0 −3		data/locale/vi-VN.ini
+2 −0		formatcode.sh
+102 −93		obs-browser-plugin.cpp
+356 −331		obs-browser-source.cpp