diff options
| author | Avi Halachmi (:avih) <avihpit@yahoo.com> | 2022-05-20 23:23:16 +0300 |
|---|---|---|
| committer | Avi Halachmi (:avih) <avihpit@yahoo.com> | 2022-05-20 23:40:07 +0300 |
| commit | 549e3cb6471ae1be9f882a3469f9ebcc2b018560 (patch) | |
| tree | 9640f5d9df0e2d97834b3a9269c41938f6a6a053 | |
| parent | d18c579c017a31cd1e4a601660e04da78f207a5e (diff) | |
| download | mpv-build-549e3cb6471ae1be9f882a3469f9ebcc2b018560.tar.bz2 mpv-build-549e3cb6471ae1be9f882a3469f9ebcc2b018560.tar.xz | |
ffmpeg-config: ssl/tls detection: identify more options
ffmpeg doesn't always autodetect/enable tls/ssl libs, so mpv-build
does that if the user didn't specify one.
However, previously it had two issues:
1. It checked for 3 options (openssl/gnutls/mbedtls) but ffmpeg
supports 6. So for instance if --enable-schannel was specified
by the user, then mpv still tried to add another one, which
resulted in a conflict which the user couldn't override easily
(needs the user options: --disable-openssl --disable-gnutls).
2. It still tried to auto-enable even if the user disabled some of
them. Not a real problem (because the user option comes after the
mpv-build auto-option), but not very nice either.
Now if any of the 6 ssl/tls names exist at the user option
(enabled/disabled/whatever) then autodetection is skipped.
| -rwxr-xr-x | scripts/ffmpeg-config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/ffmpeg-config b/scripts/ffmpeg-config index c36a424..9c8bddc 100755 --- a/scripts/ffmpeg-config +++ b/scripts/ffmpeg-config @@ -20,7 +20,7 @@ fi # Do FFmpeg's job. if ( echo "$OPTIONS" "$@" | \ - grep -q -E -e "--enable-openssl|--enable-gnutls|--enable-mbedtls" ) + grep -q -E -e "-openssl|-gnutls|-mbedtls|-libtls|-schannel|-securetransport" ) then echo TLS/SSL user option specified, skipping autodetection else |