diff --git a/ffmpeg-definitions.rkt b/ffmpeg-definitions.rkt index e2b11eb..493652f 100644 --- a/ffmpeg-definitions.rkt +++ b/ffmpeg-definitions.rkt @@ -256,23 +256,22 @@ ;;;; Needed functions for audio decoder - -(define libavutil (get-lib (list (case (system-type 'os) - [(windows) "avutil-60"] - [else "avutil"])) '(#f))) +(define libavutil (get-lib (case (system-type 'os) + [(windows) '("avutil-60")] + [else '("avutil" "libavutil")]) '(#f))) -(define libswresample (get-lib (list (case (system-type 'os) - [(windows) "swresample-6"] - [else "swresample"])) '(#f))) +(define libswresample (get-lib (case (system-type 'os) + [(windows) '("swresample-6")] + [else '("swresample" "libswresample")]) '(#f))) -(define libavcodec (get-lib (list (case (system-type 'os) - [(windows) "avcodec-62"] - [else "avcodec"])) '(#f))) +(define libavcodec (get-lib (case (system-type 'os) + [(windows) '("avcodec-62")] + [else '("avcodec" "libavcodec")]) '(#f))) -(define libavformat (get-lib (list (case (system-type 'os) - [(windows) "avformat-62"] - [else "avformat"])) '(#f))) +(define libavformat (get-lib (case (system-type 'os) + [(windows) '("avformat-62")] + [else '("avformat" "libavformat")]) '(#f))) (define-ffi-definer def-avutil libavutil #:default-make-fail make-not-available) diff --git a/private/utils.rkt b/private/utils.rkt index 783cbed..b96dbe6 100644 --- a/private/utils.rkt +++ b/private/utils.rkt @@ -157,8 +157,10 @@ (cons (soundlibs-directory) p))) (define (get-lib* libs-to-try orig-libs versions) + (unless (soundlibs-available?) (download-soundlibs)) + (let ((libs-path (build-lib-path (get-lib-search-dirs)))) (if (null? libs-to-try) (begin