mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-09-20 04:42:18 +02:00
obs-ffmpeg: Remove unused parameter
This commit is contained in:
parent
348cf1b872
commit
fcc94634d9
@ -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;
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user