Kieran/ffmpeg-the-third
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove avresample

Browse Source 
The crate never supported any wrappers for it
and FFmpeg 5.0 dropped it anyways.
This commit is contained in:
FreezyLemon 2024-10-30 11:34:46 +01:00 committed by Josh Holmer
parent 144bf1779b
commit f1e978b58d
3 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -58,7 +58,6 @@ codec = ["ffmpeg-sys-the-third/avcodec"]
device = ["ffmpeg-sys-the-third/avdevice", "format"] device = ["ffmpeg-sys-the-third/avdevice", "format"]
filter = ["ffmpeg-sys-the-third/avfilter"] filter = ["ffmpeg-sys-the-third/avfilter"]
format = ["ffmpeg-sys-the-third/avformat", "codec"] format = ["ffmpeg-sys-the-third/avformat", "codec"]
resampling = ["ffmpeg-sys-the-third/avresample"]
postprocessing = ["ffmpeg-sys-the-third/postproc"] postprocessing = ["ffmpeg-sys-the-third/postproc"]
software-resampling = ["ffmpeg-sys-the-third/swresample"] software-resampling = ["ffmpeg-sys-the-third/swresample"]
software-scaling = ["ffmpeg-sys-the-third/swscale", "codec"] software-scaling = ["ffmpeg-sys-the-third/swscale", "codec"]

1
ffmpeg-sys-the-third/Cargo.toml
View File

@ -58,7 +58,6 @@ avcodec = []
avdevice = ["avformat"] avdevice = ["avformat"]
avfilter = [] avfilter = []
avformat = ["avcodec"] avformat = ["avcodec"]
avresample = []
postproc = [] postproc = []
swresample = [] swresample = []
swscale = [] swscale = []

13
ffmpeg-sys-the-third/build.rs
View File

@ -66,7 +66,6 @@ static LIBRARIES: &[Library] = &[
Library::optional("avformat", AVFORMAT_FEATURES, AVFORMAT_HEADERS), Library::optional("avformat", AVFORMAT_FEATURES, AVFORMAT_HEADERS),
Library::optional("avdevice", AVDEVICE_FEATURES, AVDEVICE_HEADERS), Library::optional("avdevice", AVDEVICE_FEATURES, AVDEVICE_HEADERS),
Library::optional("avfilter", AVFILTER_FEATURES, AVFILTER_HEADERS), Library::optional("avfilter", AVFILTER_FEATURES, AVFILTER_HEADERS),
Library::optional("avresample", AVRESAMPLE_FEATURES, AVRESAMPLE_HEADERS),
Library::optional("swscale", SWSCALE_FEATURES, SWSCALE_HEADERS), Library::optional("swscale", SWSCALE_FEATURES, SWSCALE_HEADERS),
Library::optional("swresample", SWRESAMPLE_FEATURES, SWRESAMPLE_HEADERS), Library::optional("swresample", SWRESAMPLE_FEATURES, SWRESAMPLE_HEADERS),
Library::optional("postproc", POSTPROC_FEATURES, POSTPROC_HEADERS), Library::optional("postproc", POSTPROC_FEATURES, POSTPROC_HEADERS),
@ -216,8 +215,6 @@ static AVFILTER_FEATURES: &[AVFeature] = &[
AVFeature::new("LINK_PUBLIC"), AVFeature::new("LINK_PUBLIC"),
]; ];
static AVRESAMPLE_FEATURES: &[AVFeature] = &[];
static SWSCALE_FEATURES: &[AVFeature] = &[]; static SWSCALE_FEATURES: &[AVFeature] = &[];
static SWRESAMPLE_FEATURES: &[AVFeature] = &[]; static SWRESAMPLE_FEATURES: &[AVFeature] = &[];
@ -302,7 +299,6 @@ static AVFILTER_HEADERS: &[AVHeader] = &[
AVHeader::new("buffersrc.h"), AVHeader::new("buffersrc.h"),
AVHeader::new("avfilter.h"), AVHeader::new("avfilter.h"),
]; ];
static AVRESAMPLE_HEADERS: &[AVHeader] = &[AVHeader::new("avresample.h")];
static SWSCALE_HEADERS: &[AVHeader] = &[AVHeader::new("swscale.h")]; static SWSCALE_HEADERS: &[AVHeader] = &[AVHeader::new("swscale.h")];
static SWRESAMPLE_HEADERS: &[AVHeader] = &[AVHeader::new("swresample.h")]; static SWRESAMPLE_HEADERS: &[AVHeader] = &[AVHeader::new("swresample.h")];
static POSTPROC_HEADERS: &[AVHeader] = &[AVHeader::new("postprocess.h")]; static POSTPROC_HEADERS: &[AVHeader] = &[AVHeader::new("postprocess.h")];
@ -562,14 +558,8 @@ fn build(out_dir: &Path, ffmpeg_version: &str) -> io::Result<PathBuf> {
// the binary using ffmpeg-sys cannot be redistributed // the binary using ffmpeg-sys cannot be redistributed
configure.switch("BUILD_LICENSE_NONFREE", "nonfree"); configure.switch("BUILD_LICENSE_NONFREE", "nonfree");
let ffmpeg_major_version: u32 = get_major_version(ffmpeg_version);
// configure building libraries based on features // configure building libraries based on features
for lib in LIBRARIES for lib in LIBRARIES.iter().filter(|lib| lib.optional) {
.iter()
.filter(|lib| lib.optional)
.filter(|lib| !(lib.name == "avresample" && ffmpeg_major_version >= 5))
{
configure.switch(&lib.name.to_uppercase(), lib.name); configure.switch(&lib.name.to_uppercase(), lib.name);
} }
@ -971,7 +961,6 @@ fn main() {
.allowlist_file(r#".*[/\\]libavformat[/\\].*"#) .allowlist_file(r#".*[/\\]libavformat[/\\].*"#)
.allowlist_file(r#".*[/\\]libavdevice[/\\].*"#) .allowlist_file(r#".*[/\\]libavdevice[/\\].*"#)
.allowlist_file(r#".*[/\\]libavfilter[/\\].*"#) .allowlist_file(r#".*[/\\]libavfilter[/\\].*"#)
.allowlist_file(r#".*[/\\]libavresample[/\\].*"#)
.allowlist_file(r#".*[/\\]libswscale[/\\].*"#) .allowlist_file(r#".*[/\\]libswscale[/\\].*"#)
.allowlist_file(r#".*[/\\]libswresample[/\\].*"#) .allowlist_file(r#".*[/\\]libswresample[/\\].*"#)
.allowlist_file(r#".*[/\\]libpostproc[/\\].*"#) .allowlist_file(r#".*[/\\]libpostproc[/\\].*"#)