Parcourir la source

Merge pull request #938 from admshao/incompatible-pointer-types

plugins: Clear warnings about -Wincompatible-pointer-types
Jim il y a 8 ans
Parent
commit
cfe77fdaae

+ 2 - 3
plugins/obs-ffmpeg/obs-ffmpeg-mux.c

@@ -492,7 +492,7 @@ static const char *replay_buffer_getname(void *type)
 	return obs_module_text("ReplayBuffer");
 }
 
-static bool replay_buffer_hotkey(void *data, obs_hotkey_id id,
+static void replay_buffer_hotkey(void *data, obs_hotkey_id id,
 		obs_hotkey_t *hotkey, bool pressed)
 {
 	UNUSED_PARAMETER(id);
@@ -502,7 +502,6 @@ static bool replay_buffer_hotkey(void *data, obs_hotkey_id id,
 	struct ffmpeg_muxer *stream = data;
 	if (os_atomic_load_bool(&stream->active))
 		stream->save_ts = os_gettime_ns() / 1000LL;
-	return true;
 }
 
 static void save_replay_proc(void *data, calldata_t *cd)
@@ -513,6 +512,7 @@ static void save_replay_proc(void *data, calldata_t *cd)
 
 static void *replay_buffer_create(obs_data_t *settings, obs_output_t *output)
 {
+	UNUSED_PARAMETER(settings);
 	struct ffmpeg_muxer *stream = bzalloc(sizeof(*stream));
 	stream->output = output;
 
@@ -524,7 +524,6 @@ static void *replay_buffer_create(obs_data_t *settings, obs_output_t *output)
 	proc_handler_t *ph = obs_output_get_proc_handler(output);
 	proc_handler_add(ph, "void save()", save_replay_proc, stream);
 
-	UNUSED_PARAMETER(settings);
 	return stream;
 }
 

+ 1 - 2
plugins/obs-ffmpeg/obs-ffmpeg-source.c

@@ -337,7 +337,7 @@ static const char *ffmpeg_source_getname(void *unused)
 	return obs_module_text("FFMpegSource");
 }
 
-static bool restart_hotkey(void *data, obs_hotkey_id id,
+static void restart_hotkey(void *data, obs_hotkey_id id,
 		obs_hotkey_t *hotkey, bool pressed)
 {
 	UNUSED_PARAMETER(id);
@@ -347,7 +347,6 @@ static bool restart_hotkey(void *data, obs_hotkey_id id,
 	struct ffmpeg_source *s = data;
 	if (obs_source_active(s->source))
 		ffmpeg_source_start(s);
-	return true;
 }
 
 static void restart_proc(void *data, calldata_t *cd)

+ 1 - 1
plugins/obs-filters/compressor-filter.c

@@ -133,7 +133,7 @@ static void compressor_destroy(void *data)
 }
 
 static inline void analyze_envelope(struct compressor_data *cd,
-	const float **samples, const uint32_t num_samples)
+	float **samples, const uint32_t num_samples)
 {
 	if (cd->envelope_buf_len < num_samples) {
 		resize_env_buffer(cd, num_samples);