Browse Source

UI, obs-ffmpeg, obs-filters: Fix compile warnings

Clayton Groeneveld 5 years ago
parent
commit
990a07dc18

+ 2 - 0
UI/window-basic-settings.cpp

@@ -76,6 +76,8 @@ protected:
 			if (key == Qt::Key_Escape) {
 				return false;
 			}
+		default:
+			break;
 		}
 
 		return shortcutFilter->filter(obj, event);

+ 1 - 1
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),

+ 2 - 2
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);
 }

+ 2 - 0
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 = {