From 23396e21e561e6de76d4e9809ca51b08a6cdf91a Mon Sep 17 00:00:00 2001 From: jpark37 Date: Sun, 8 May 2022 03:54:40 -0700 Subject: [PATCH] libobs: Allow transitions to mix CCCS sources Wasn't sure if CCCS sources should be allowed, but it fits image source. --- libobs/obs-source-transition.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libobs/obs-source-transition.c b/libobs/obs-source-transition.c index 17e696788..45869bc47 100644 --- a/libobs/obs-source-transition.c +++ b/libobs/obs-source-transition.c @@ -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;