diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-formats.h b/plugins/obs-ffmpeg/obs-ffmpeg-formats.h index b9cc7ac5d..977b3c6d2 100644 --- a/plugins/obs-ffmpeg/obs-ffmpeg-formats.h +++ b/plugins/obs-ffmpeg/obs-ffmpeg-formats.h @@ -69,7 +69,7 @@ obs_to_ffmpeg_video_format(enum video_format format) } } -static enum AVChromaLocation +static inline enum AVChromaLocation determine_chroma_location(enum AVPixelFormat pix_fmt, enum AVColorSpace colorspace) { diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-output.c b/plugins/obs-ffmpeg/obs-ffmpeg-output.c index 899f5e2d0..440d58ef7 100644 --- a/plugins/obs-ffmpeg/obs-ffmpeg-output.c +++ b/plugins/obs-ffmpeg/obs-ffmpeg-output.c @@ -565,6 +565,7 @@ static inline const char *safe_str(const char *s) return s; } +#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(59, 0, 100) static enum AVCodecID get_codec_id(const char *name, int id) { const AVCodec *codec; @@ -582,7 +583,6 @@ static enum AVCodecID get_codec_id(const char *name, int id) return codec->id; } -#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(59, 0, 100) static void set_encoder_ids(struct ffmpeg_data *data) { data->output->oformat->video_codec = get_codec_id(