From 79981889c6d87d6e371e9dc8fcaad36f06eb9c9e Mon Sep 17 00:00:00 2001 From: Richard Stanway Date: Sat, 23 May 2020 23:44:06 +0200 Subject: [PATCH] obs-filters: Misc code cleanups detected by PVS Studio --- plugins/obs-filters/compressor-filter.c | 3 +-- plugins/obs-filters/crop-filter.c | 4 ++-- plugins/obs-filters/scale-filter.c | 2 -- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/plugins/obs-filters/compressor-filter.c b/plugins/obs-filters/compressor-filter.c index 734994a7f..1808bd74e 100644 --- a/plugins/obs-filters/compressor-filter.c +++ b/plugins/obs-filters/compressor-filter.c @@ -410,8 +410,7 @@ static void compressor_tick(void *data, float seconds) if (new_name) { obs_source_t *sidechain = - new_name && *new_name ? obs_get_source_by_name(new_name) - : NULL; + *new_name ? obs_get_source_by_name(new_name) : NULL; obs_weak_source_t *weak_sidechain = sidechain ? obs_source_get_weak_source(sidechain) : NULL; diff --git a/plugins/obs-filters/crop-filter.c b/plugins/obs-filters/crop-filter.c index 2c05cf167..f73bbadb5 100644 --- a/plugins/obs-filters/crop-filter.c +++ b/plugins/obs-filters/crop-filter.c @@ -160,12 +160,12 @@ static void calc_crop_dimensions(struct crop_filter_data *filter, if (filter->height < 1) filter->height = 1; - if (width && filter->width) { + if (width) { mul_val->x = (float)filter->width / (float)width; add_val->x = (float)filter->left / (float)width; } - if (height && filter->height) { + if (height) { mul_val->y = (float)filter->height / (float)height; add_val->y = (float)filter->top / (float)height; } diff --git a/plugins/obs-filters/scale-filter.c b/plugins/obs-filters/scale-filter.c index 59726b7bf..79823f7b8 100644 --- a/plugins/obs-filters/scale-filter.c +++ b/plugins/obs-filters/scale-filter.c @@ -195,9 +195,7 @@ static void scale_filter_tick(void *data, float seconds) } else { if (new_aspect > old_aspect) { filter->cx_out = (int)(cy_f * new_aspect); - filter->cy_out = cy; } else { - filter->cx_out = cx; filter->cy_out = (int)(cx_f / new_aspect); } }