obs-ffmpeg: Resolve unused-function warnings

norihiro · RytoEX · commit e9c440401cf4 · 2024-08-07T17:27:49.000-04:00
diff --git 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
@@ -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(

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ obs_to_ffmpeg_video_format(enum video_format format)`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`-static enum AVChromaLocation`
	`72`	`+static inline enum AVChromaLocation`
`73`	`73`	`determine_chroma_location(enum AVPixelFormat pix_fmt,`
`74`	`74`	`enum AVColorSpace colorspace)`
`75`	`75`	`{`
Original file line number	Diff line number	Diff line change
`@@ -565,6 +565,7 @@ static inline const char safe_str(const char s)`
`565`	`565`	`return s;`
`566`	`566`	`}`
`567`	`567`
	`568`	`+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(59, 0, 100)`
`568`	`569`	`static enum AVCodecID get_codec_id(const char *name, int id)`
`569`	`570`	`{`
`570`	`571`	`const AVCodec *codec;`
`@@ -582,7 +583,6 @@ static enum AVCodecID get_codec_id(const char *name, int id)`
`582`	`583`	`return codec->id;`
`583`	`584`	`}`
`584`	`585`
`585`		`-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(59, 0, 100)`
`586`	`586`	`static void set_encoder_ids(struct ffmpeg_data *data)`
`587`	`587`	`{`
`588`	`588`	`data->output->oformat->video_codec = get_codec_id(`