jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libobs: Allow transitions to mix CCCS sources 

Wasn't sure if CCCS sources should be allowed, but it fits image source.
master
jpark37 2022-05-08 03:54:40 -07:00
parent 2a0d8d1c9c
commit 23396e21e5
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libobs/obs-source-transition.c
View File

@ -832,12 +832,8 @@ void obs_transition_video_render2(
static enum gs_color_space mix_spaces(enum gs_color_space a,
enum gs_color_space b)
{
assert((a == GS_CS_SRGB) || (a == GS_CS_SRGB_16F) ||
(a == GS_CS_709_EXTENDED));
assert((b == GS_CS_SRGB) || (b == GS_CS_SRGB_16F) ||
(b == GS_CS_709_EXTENDED));
if ((a == GS_CS_709_EXTENDED) || (b == GS_CS_709_EXTENDED))
if ((a == GS_CS_709_EXTENDED) || (a == GS_CS_709_SCRGB) ||
(b == GS_CS_709_EXTENDED) || (b == GS_CS_709_SCRGB))
return GS_CS_709_EXTENDED;
if ((a == GS_CS_SRGB_16F) || (b == GS_CS_SRGB_16F))
return GS_CS_SRGB_16F;