Browse Source

obs-ffmpeg: Resolve unused-function warnings

Norihiro Kamae 1 year ago
parent
commit
e9c440401c

+ 1 - 1
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,
 determine_chroma_location(enum AVPixelFormat pix_fmt,
 			  enum AVColorSpace colorspace)
 			  enum AVColorSpace colorspace)
 {
 {

+ 1 - 1
plugins/obs-ffmpeg/obs-ffmpeg-output.c

@@ -565,6 +565,7 @@ static inline const char *safe_str(const char *s)
 		return s;
 		return s;
 }
 }
 
 
+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(59, 0, 100)
 static enum AVCodecID get_codec_id(const char *name, int id)
 static enum AVCodecID get_codec_id(const char *name, int id)
 {
 {
 	const AVCodec *codec;
 	const AVCodec *codec;
@@ -582,7 +583,6 @@ static enum AVCodecID get_codec_id(const char *name, int id)
 	return codec->id;
 	return codec->id;
 }
 }
 
 
-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(59, 0, 100)
 static void set_encoder_ids(struct ffmpeg_data *data)
 static void set_encoder_ids(struct ffmpeg_data *data)
 {
 {
 	data->output->oformat->video_codec = get_codec_id(
 	data->output->oformat->video_codec = get_codec_id(