From 990a07dc187688d567ab61bc569741edd2050cdf Mon Sep 17 00:00:00 2001
From: Clayton Groeneveld <claytong1214@gmail.com>
Date: Thu, 16 Jul 2020 23:15:13 -0500
Subject: [PATCH] UI, obs-ffmpeg, obs-filters: Fix compile warnings

---
 UI/window-basic-settings.cpp             | 2 ++
 UI/window-basic-status-bar.cpp           | 2 +-
 plugins/obs-ffmpeg/obs-ffmpeg-mux.c      | 4 ++--
 plugins/obs-filters/color-grade-filter.c | 2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp
index a55a02139..9ecedd368 100644
--- a/UI/window-basic-settings.cpp
+++ b/UI/window-basic-settings.cpp
@@ -76,6 +76,8 @@ protected:
 			if (key == Qt::Key_Escape) {
 				return false;
 			}
+		default:
+			break;
 		}
 
 		return shortcutFilter->filter(obj, event);
diff --git a/UI/window-basic-status-bar.cpp b/UI/window-basic-status-bar.cpp
index 93cc4af28..e42557551 100644
--- a/UI/window-basic-status-bar.cpp
+++ b/UI/window-basic-status-bar.cpp
@@ -13,8 +13,8 @@ OBSBasicStatusBar::OBSBasicStatusBar(QWidget *parent)
 	  droppedFrames(new QLabel),
 	  streamIcon(new QLabel),
 	  streamTime(new QLabel),
-	  recordIcon(new QLabel),
 	  recordTime(new QLabel),
+	  recordIcon(new QLabel),
 	  cpuUsage(new QLabel),
 	  transparentPixmap(20, 20),
 	  greenPixmap(20, 20),
diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-mux.c b/plugins/obs-ffmpeg/obs-ffmpeg-mux.c
index 70b42184a..72945c05b 100644
--- a/plugins/obs-ffmpeg/obs-ffmpeg-mux.c
+++ b/plugins/obs-ffmpeg/obs-ffmpeg-mux.c
@@ -556,7 +556,7 @@ struct obs_output_info ffmpeg_muxer = {
 	.get_properties = ffmpeg_mux_properties,
 };
 
-static int connect_time(struct ffmpeg_mux *stream)
+static int connect_time(struct ffmpeg_muxer *stream)
 {
 	UNUSED_PARAMETER(stream);
 	/* TODO */
@@ -565,7 +565,7 @@ static int connect_time(struct ffmpeg_mux *stream)
 
 static int ffmpeg_mpegts_mux_connect_time(void *data)
 {
-	struct ffmpeg_mux *stream = data;
+	struct ffmpeg_muxer *stream = data;
 	/* TODO */
 	return connect_time(stream);
 }
diff --git a/plugins/obs-filters/color-grade-filter.c b/plugins/obs-filters/color-grade-filter.c
index ac0745e6e..8d814e69b 100644
--- a/plugins/obs-filters/color-grade-filter.c
+++ b/plugins/obs-filters/color-grade-filter.c
@@ -454,6 +454,8 @@ static void color_grade_filter_render(void *data, gs_effect_t *effect)
 
 	obs_source_process_filter_tech_end(filter->context, filter->effect, 0,
 					   0, tech_name);
+
+	UNUSED_PARAMETER(effect);
 }
 
 struct obs_source_info color_grade_filter = {