@@ -404,7 +404,7 @@ fn static_linking(env_vars: &EnvVars) {
404
404
output_binding_path : & Path ,
405
405
) -> Result < ( ) , pkg_config:: Error > {
406
406
// Probe libraries(enable emitting cargo metadata)
407
- let include_paths = linking_with_pkg_config ( & * LIBS ) ?;
407
+ let include_paths = pkg_config_linking :: linking_with_pkg_config ( & * LIBS ) ?;
408
408
if let Some ( ffmpeg_binding_path) = env_vars. ffmpeg_binding_path . as_ref ( ) {
409
409
use_prebuilt_binding ( ffmpeg_binding_path, output_binding_path) ;
410
410
} else if let Some ( ffmpeg_include_dir) = env_vars. ffmpeg_include_dir . as_ref ( ) {
@@ -419,7 +419,6 @@ fn static_linking(env_vars: &EnvVars) {
419
419
}
420
420
Ok ( ( ) )
421
421
}
422
- use pkg_config_linking:: * ;
423
422
// Hint: set PKG_CONFIG_PATH to some placeholder value will let pkg_config probing system library.
424
423
if let Some ( ffmpeg_pkg_config_path) = env_vars. ffmpeg_pkg_config_path . as_ref ( ) {
425
424
if !Path :: new ( ffmpeg_pkg_config_path) . exists ( ) {
@@ -447,9 +446,9 @@ fn static_linking(env_vars: &EnvVars) {
447
446
panic ! (
448
447
"
449
448
!!!!!!! rusty_ffmpeg: No linking method set!
450
- Use FFMPEG_PKG_CONFIG_PATH or FFMPEG_LIBS_DIR if you have prebuilt FFmpeg libraries.
451
- Enable `link_system_ffmpeg` feature if you want to link ffmpeg libraries install in system path.
452
- Enable `link_vcpkg_ffmpeg` feature if you want to link ffmpeg provided by vcpkg.
449
+ Use ` FFMPEG_PKG_CONFIG_PATH` or ` FFMPEG_LIBS_DIR` if you have prebuilt FFmpeg libraries.
450
+ Enable `link_system_ffmpeg` feature if you want to link ffmpeg libraries installed in system path(which can be probed by pkg-config) .
451
+ Enable `link_vcpkg_ffmpeg` feature if you want to link ffmpeg libraries installed by vcpkg.
453
452
"
454
453
) ;
455
454
#[ cfg( any( feature = "link_system_ffmpeg" , feature = "link_vcpkg_ffmpeg" ) ) ]
0 commit comments