jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

obs-ffmpeg: Remove unused parameter

master
tytan652 2022-07-20 08:12:48 +02:00
parent 348cf1b872
commit fcc94634d9
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/obs-ffmpeg/obs-ffmpeg-av1.c
View File

@ -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;

16
plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c
View File

@ -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;
}

1
plugins/obs-ffmpeg/obs-ffmpeg-video-encoders.c
View File

@ -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,

3
plugins/obs-ffmpeg/obs-ffmpeg-video-encoders.h
View File

@ -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,