@@ -245,10 +245,13 @@ fn generate_bindings(ffmpeg_include_dir: &Path, headers: &[PathBuf]) -> Bindings
245245fn linking_with_libs_dir ( library_names : & [ & str ] , ffmpeg_libs_dir : & Path , mode : FfmpegLinkMode ) {
246246 println ! ( "cargo:rustc-link-search=native={ffmpeg_libs_dir}" ) ;
247247 for library_name in library_names {
248- println ! ( "cargo:rustc-link-lib={}={library_name}" , match mode {
249- FfmpegLinkMode :: Dynamic => "dylib" ,
250- FfmpegLinkMode :: Static => "static" ,
251- } ) ;
248+ println ! (
249+ "cargo:rustc-link-lib={}={library_name}" ,
250+ match mode {
251+ FfmpegLinkMode :: Dynamic => "dylib" ,
252+ FfmpegLinkMode :: Static => "static" ,
253+ }
254+ ) ;
252255 }
253256}
254257
@@ -292,7 +295,7 @@ impl EnvVars {
292295 Some ( "dynamic" ) => Some ( FfmpegLinkMode :: Dynamic ) ,
293296 Some ( r) => panic ! ( "invalid FFMPEG_LINK_MODE value {r}, expected [static,dynamic]" ) ,
294297 None => None ,
295- }
298+ } ,
296299 }
297300 }
298301}
@@ -459,7 +462,11 @@ fn linking(env_vars: EnvVars) {
459462 linking_with_pkg_config_and_bindgen ( & env_vars, output_binding_path)
460463 . expect ( "Static linking with pkg-config failed." ) ;
461464 } else if let Some ( ffmpeg_libs_dir) = env_vars. ffmpeg_libs_dir . as_ref ( ) {
462- linking_with_libs_dir ( & * LIBS , ffmpeg_libs_dir, env_vars. ffmpeg_link_mode . unwrap_or ( FfmpegLinkMode :: Static ) ) ;
465+ linking_with_libs_dir (
466+ & * LIBS ,
467+ ffmpeg_libs_dir,
468+ env_vars. ffmpeg_link_mode . unwrap_or ( FfmpegLinkMode :: Static ) ,
469+ ) ;
463470 if let Some ( ffmpeg_binding_path) = env_vars. ffmpeg_binding_path . as_ref ( ) {
464471 use_prebuilt_binding ( ffmpeg_binding_path, output_binding_path) ;
465472 } else if let Some ( ffmpeg_include_dir) = env_vars. ffmpeg_include_dir . as_ref ( ) {
@@ -497,9 +504,10 @@ Enable `link_vcpkg_ffmpeg` feature if you want to link ffmpeg libraries installe
497504 }
498505 #[ cfg( feature = "link_vcpkg_ffmpeg" ) ]
499506 if !success {
500- if let Err ( e) =
501- vcpkg_linking:: linking_with_vcpkg_and_bindgen ( & env_vars, output_binding_path)
502- {
507+ if let Err ( e) = vcpkg_linking:: linking_with_vcpkg_and_bindgen (
508+ & env_vars,
509+ output_binding_path,
510+ ) {
503511 error. push ( '\n' ) ;
504512 error. push_str ( & format ! ( "Link vcpkg FFmpeg failed: {:?}" , e) ) ;
505513 } else {
@@ -516,7 +524,7 @@ Enable `link_vcpkg_ffmpeg` feature if you want to link ffmpeg libraries installe
516524 #[ cfg( target_os = "windows" ) ]
517525 {
518526 if let Some ( ffmpeg_libs_dir) = env_vars. ffmpeg_libs_dir . as_ref ( ) {
519- linking_with_libs_dir ( & * LIBS , ffmpeg_libs_dir, env_vars. ffmpeg_link_mode ) ;
527+ linking_with_libs_dir ( & * LIBS , ffmpeg_libs_dir, env_vars. ffmpeg_link_mode . unwrap_or ( FfmpegLinkMode :: Static ) ) ;
520528 if let Some ( ffmpeg_binding_path) = env_vars. ffmpeg_binding_path . as_ref ( ) {
521529 use_prebuilt_binding ( ffmpeg_binding_path, output_binding_path) ;
522530 } else if let Some ( ffmpeg_include_dir) = env_vars. ffmpeg_include_dir . as_ref ( ) {
0 commit comments