@@ -66,7 +66,6 @@ static LIBRARIES: &[Library] = &[
66
66
Library :: optional ( "avformat" , AVFORMAT_FEATURES , AVFORMAT_HEADERS ) ,
67
67
Library :: optional ( "avdevice" , AVDEVICE_FEATURES , AVDEVICE_HEADERS ) ,
68
68
Library :: optional ( "avfilter" , AVFILTER_FEATURES , AVFILTER_HEADERS ) ,
69
- Library :: optional ( "avresample" , AVRESAMPLE_FEATURES , AVRESAMPLE_HEADERS ) ,
70
69
Library :: optional ( "swscale" , SWSCALE_FEATURES , SWSCALE_HEADERS ) ,
71
70
Library :: optional ( "swresample" , SWRESAMPLE_FEATURES , SWRESAMPLE_HEADERS ) ,
72
71
Library :: optional ( "postproc" , POSTPROC_FEATURES , POSTPROC_HEADERS ) ,
@@ -216,8 +215,6 @@ static AVFILTER_FEATURES: &[AVFeature] = &[
216
215
AVFeature :: new ( "LINK_PUBLIC" ) ,
217
216
] ;
218
217
219
- static AVRESAMPLE_FEATURES : & [ AVFeature ] = & [ ] ;
220
-
221
218
static SWSCALE_FEATURES : & [ AVFeature ] = & [ ] ;
222
219
223
220
static SWRESAMPLE_FEATURES : & [ AVFeature ] = & [ ] ;
@@ -302,7 +299,6 @@ static AVFILTER_HEADERS: &[AVHeader] = &[
302
299
AVHeader :: new ( "buffersrc.h" ) ,
303
300
AVHeader :: new ( "avfilter.h" ) ,
304
301
] ;
305
- static AVRESAMPLE_HEADERS : & [ AVHeader ] = & [ AVHeader :: new ( "avresample.h" ) ] ;
306
302
static SWSCALE_HEADERS : & [ AVHeader ] = & [ AVHeader :: new ( "swscale.h" ) ] ;
307
303
static SWRESAMPLE_HEADERS : & [ AVHeader ] = & [ AVHeader :: new ( "swresample.h" ) ] ;
308
304
static POSTPROC_HEADERS : & [ AVHeader ] = & [ AVHeader :: new ( "postprocess.h" ) ] ;
@@ -562,14 +558,8 @@ fn build(out_dir: &Path, ffmpeg_version: &str) -> io::Result<PathBuf> {
562
558
// the binary using ffmpeg-sys cannot be redistributed
563
559
configure. switch ( "BUILD_LICENSE_NONFREE" , "nonfree" ) ;
564
560
565
- let ffmpeg_major_version: u32 = get_major_version ( ffmpeg_version) ;
566
-
567
561
// configure building libraries based on features
568
- for lib in LIBRARIES
569
- . iter ( )
570
- . filter ( |lib| lib. optional )
571
- . filter ( |lib| !( lib. name == "avresample" && ffmpeg_major_version >= 5 ) )
572
- {
562
+ for lib in LIBRARIES . iter ( ) . filter ( |lib| lib. optional ) {
573
563
configure. switch ( & lib. name . to_uppercase ( ) , lib. name ) ;
574
564
}
575
565
@@ -971,7 +961,6 @@ fn main() {
971
961
. allowlist_file ( r#".*[/\\]libavformat[/\\].*"# )
972
962
. allowlist_file ( r#".*[/\\]libavdevice[/\\].*"# )
973
963
. allowlist_file ( r#".*[/\\]libavfilter[/\\].*"# )
974
- . allowlist_file ( r#".*[/\\]libavresample[/\\].*"# )
975
964
. allowlist_file ( r#".*[/\\]libswscale[/\\].*"# )
976
965
. allowlist_file ( r#".*[/\\]libswresample[/\\].*"# )
977
966
. allowlist_file ( r#".*[/\\]libpostproc[/\\].*"# )
0 commit comments