Răsfoiți Sursa

obs-ffmpeg: Remove unused parameter

tytan652 3 ani în urmă
părinte
comite
fcc94634d9

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

@@ -175,9 +175,8 @@ static void *av1_create_internal(obs_data_t *settings, obs_encoder_t *encoder,
 	if (strcmp(enc_lib, "libsvtav1") == 0)
 		enc->svtav1 = true;
 
-	if (!ffmpeg_video_encoder_init(&enc->ffve, enc, settings, encoder,
-				       enc_lib, NULL, enc_name, NULL,
-				       on_first_packet))
+	if (!ffmpeg_video_encoder_init(&enc->ffve, enc, encoder, enc_lib, NULL,
+				       enc_name, NULL, on_first_packet))
 		goto fail;
 	if (!av1_update(enc, settings))
 		goto fail;

+ 8 - 8
plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c

@@ -284,20 +284,20 @@ static void *nvenc_create_internal(obs_data_t *settings, obs_encoder_t *encoder,
 #ifdef ENABLE_HEVC
 	enc->hevc = hevc;
 	if (hevc) {
-		if (!ffmpeg_video_encoder_init(&enc->ffve, enc, settings,
-					       encoder, "hevc_nvenc",
-					       "nvenc_hevc", ENCODER_NAME_HEVC,
-					       on_init_error, on_first_packet))
+		if (!ffmpeg_video_encoder_init(&enc->ffve, enc, encoder,
+					       "hevc_nvenc", "nvenc_hevc",
+					       ENCODER_NAME_HEVC, on_init_error,
+					       on_first_packet))
 			goto fail;
 	} else
 #else
 	UNUSED_PARAMETER(hevc);
 #endif
 	{
-		if (!ffmpeg_video_encoder_init(&enc->ffve, enc, settings,
-					       encoder, "h264_nvenc",
-					       "nvenc_h264", ENCODER_NAME_H264,
-					       on_init_error, on_first_packet))
+		if (!ffmpeg_video_encoder_init(&enc->ffve, enc, encoder,
+					       "h264_nvenc", "nvenc_h264",
+					       ENCODER_NAME_H264, on_init_error,
+					       on_first_packet))
 			goto fail;
 	}
 

+ 0 - 1
plugins/obs-ffmpeg/obs-ffmpeg-video-encoders.c

@@ -142,7 +142,6 @@ void ffmpeg_video_encoder_free(struct ffmpeg_video_encoder *enc)
 }
 
 bool ffmpeg_video_encoder_init(struct ffmpeg_video_encoder *enc, void *parent,
-			       obs_data_t *settings OBS_UNUSED,
 			       obs_encoder_t *encoder, const char *enc_lib,
 			       const char *enc_lib2, const char *enc_name,
 			       init_error_cb on_init_error,

+ 1 - 2
plugins/obs-ffmpeg/obs-ffmpeg-video-encoders.h

@@ -39,8 +39,7 @@ struct ffmpeg_video_encoder {
 };
 
 extern bool ffmpeg_video_encoder_init(struct ffmpeg_video_encoder *enc,
-				      void *parent, obs_data_t *settings,
-				      obs_encoder_t *encoder,
+				      void *parent, obs_encoder_t *encoder,
 				      const char *enc_lib, const char *enc_lib2,
 				      const char *enc_name,
 				      init_error_cb on_init_error,