diff --git a/libobs/graphics/graphics-ffmpeg.c b/libobs/graphics/graphics-ffmpeg.c index 6a42a16d6..4d31c68f8 100644 --- a/libobs/graphics/graphics-ffmpeg.c +++ b/libobs/graphics/graphics-ffmpeg.c @@ -152,9 +152,9 @@ static void *ffmpeg_image_copy_data_straight(struct ffmpeg_image *info, return data; } -static inline size_t get_dst_position(size_t src OBS_UNUSED, const size_t w, - const size_t h, const size_t x, - const size_t y, int orient) +static inline size_t get_dst_position(const size_t w, const size_t h, + const size_t x, const size_t y, + int orient) { size_t res_x = 0; size_t res_y = 0; @@ -343,8 +343,7 @@ static void *ffmpeg_image_orient(struct ffmpeg_image *info, void *in_data, for (size_t x = x0; x < lim_x; x++) { off_src = (x + y * sx) * 4; - off_dst = get_dst_position(off_src, - info->cx, + off_dst = get_dst_position(info->cx, info->cy, x, y, orient); diff --git a/libobs/obs-scene.c b/libobs/obs-scene.c index a77ec9799..bb4a6fcd8 100644 --- a/libobs/obs-scene.c +++ b/libobs/obs-scene.c @@ -2059,8 +2059,7 @@ static inline bool source_has_audio(obs_source_t *source) static obs_sceneitem_t *obs_scene_add_internal(obs_scene_t *scene, obs_source_t *source, - obs_sceneitem_t *insert_after, - bool create_texture OBS_UNUSED) + obs_sceneitem_t *insert_after) { struct obs_scene_item *last; struct obs_scene_item *item; @@ -2158,8 +2157,7 @@ release_source_and_fail: obs_sceneitem_t *obs_scene_add(obs_scene_t *scene, obs_source_t *source) { - obs_sceneitem_t *item = - obs_scene_add_internal(scene, source, NULL, true); + obs_sceneitem_t *item = obs_scene_add_internal(scene, source, NULL); struct calldata params; uint8_t stack[128]; @@ -3286,8 +3284,8 @@ obs_sceneitem_t *obs_scene_insert_group(obs_scene_t *scene, const char *name, obs_scene_t *sub_scene = create_id("group", name); obs_sceneitem_t *last_item = items ? items[count - 1] : NULL; - obs_sceneitem_t *item = obs_scene_add_internal(scene, sub_scene->source, - last_item, true); + obs_sceneitem_t *item = + obs_scene_add_internal(scene, sub_scene->source, last_item); obs_scene_release(sub_scene); @@ -3409,8 +3407,7 @@ void obs_sceneitem_group_ungroup(obs_sceneitem_t *item) obs_sceneitem_t *dst; remove_group_transform(item, last); - dst = obs_scene_add_internal(scene, last->source, insert_after, - false); + dst = obs_scene_add_internal(scene, last->source, insert_after); duplicate_item_data(dst, last, true, true, true); apply_group_transform(last, item); diff --git a/libobs/obs-video.c b/libobs/obs-video.c index 1a505b9ff..4ac2deff3 100644 --- a/libobs/obs-video.c +++ b/libobs/obs-video.c @@ -599,8 +599,7 @@ static const uint8_t *set_gpu_converted_plane(uint32_t width, uint32_t height, return in; } -static void set_gpu_converted_data(struct obs_core_video *video OBS_UNUSED, - struct video_frame *output, +static void set_gpu_converted_data(struct video_frame *output, const struct video_data *input, const struct video_output_info *info) { @@ -777,8 +776,8 @@ static inline void output_video_data(struct obs_core_video *video, input_frame->timestamp); if (locked) { if (video->gpu_conversion) { - set_gpu_converted_data(video, &output_frame, - input_frame, info); + set_gpu_converted_data(&output_frame, input_frame, + info); } else { copy_rgbx_frame(&output_frame, input_frame, info); }