From 12657e4fcca313d6fe2b1af356af82d97f0546b6 Mon Sep 17 00:00:00 2001 From: tytan652 Date: Tue, 19 Jul 2022 19:28:49 +0200 Subject: [PATCH] libobs: Replace OBS_UNUSED with UNUSED_PARAMETER OBS_UNUSED is not portable to MSVC. --- libobs/obs-scene.c | 10 +++++++--- libobs/util/bmem.c | 3 ++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libobs/obs-scene.c b/libobs/obs-scene.c index bb4a6fcd8..c09c7a1cd 100644 --- a/libobs/obs-scene.c +++ b/libobs/obs-scene.c @@ -1499,10 +1499,14 @@ static bool scene_audio_render(void *data, uint64_t *ts_out, return true; } -enum gs_color_space scene_video_get_color_space( - void *data OBS_UNUSED, size_t count OBS_UNUSED, - const enum gs_color_space *preferred_spaces OBS_UNUSED) +enum gs_color_space +scene_video_get_color_space(void *data, size_t count, + const enum gs_color_space *preferred_spaces) { + UNUSED_PARAMETER(data); + UNUSED_PARAMETER(count); + UNUSED_PARAMETER(preferred_spaces); + enum gs_color_space space = GS_CS_SRGB; struct obs_video_info ovi; if (obs_get_video_info(&ovi)) { diff --git a/libobs/util/bmem.c b/libobs/util/bmem.c index 7ee188a9c..dbe6fce9d 100644 --- a/libobs/util/bmem.c +++ b/libobs/util/bmem.c @@ -162,6 +162,7 @@ void *bmemdup(const void *ptr, size_t size) return out; } -OBS_DEPRECATED void base_set_allocator(struct base_allocator *defs OBS_UNUSED) +OBS_DEPRECATED void base_set_allocator(struct base_allocator *defs) { + UNUSED_PARAMETER(defs); }