Browse Source

Merge pull request #793 from juvester/unused-params

obs-ffmpeg, UI: Fix compiler warnings
Jim 8 years ago
parent
commit
da1fddbd84
2 changed files with 5 additions and 0 deletions
  1. 1 0
      UI/window-basic-settings.cpp
  2. 4 0
      plugins/obs-ffmpeg/obs-ffmpeg-mux.c

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

@@ -3184,6 +3184,7 @@ void OBSBasicSettings::on_filenameFormatting_textEdited(const QString &text)
 		text.toStdString().find_first_of("<>:\"|?*");
 #else
 	size_t invalidLocation = string::npos;
+	UNUSED_PARAMETER(text);
 #endif
 
 	if (invalidLocation != string::npos)

+ 4 - 0
plugins/obs-ffmpeg/obs-ffmpeg-mux.c

@@ -485,6 +485,10 @@ static const char *replay_buffer_getname(void *type)
 static bool replay_buffer_hotkey(void *data, obs_hotkey_id id,
 		obs_hotkey_t *hotkey, bool pressed)
 {
+	UNUSED_PARAMETER(id);
+	UNUSED_PARAMETER(hotkey);
+	UNUSED_PARAMETER(pressed);
+
 	struct ffmpeg_muxer *stream = data;
 	if (os_atomic_load_bool(&stream->active))
 		stream->save_ts = os_gettime_ns() / 1000LL;