diff options
| author | V. Lang <nfxjfg@googlemail.com> | 2015-03-29 22:59:35 +0200 |
|---|---|---|
| committer | V. Lang <nfxjfg@googlemail.com> | 2015-03-29 22:59:35 +0200 |
| commit | 44f958b4f0d7facaae7c18d8139c83bfcfb0f161 (patch) | |
| tree | dfab91b894cedd0133be35dfe0b4b9790b7e9d3b | |
| parent | 5a7ea7c6dc5b07c22981651675539217b29035fa (diff) | |
| parent | f0e2af616c443cd798e526ca51de9d7ab3671dab (diff) | |
| download | mpv-build-44f958b4f0d7facaae7c18d8139c83bfcfb0f161.tar.bz2 mpv-build-44f958b4f0d7facaae7c18d8139c83bfcfb0f161.tar.xz | |
Merge pull request #58 from wd0/ffmpeg_config_nonfree
ffmpeg-config: prefer gnutls and redistribution
| -rwxr-xr-x | scripts/ffmpeg-config | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/ffmpeg-config b/scripts/ffmpeg-config index 7ff138f..3c0be56 100755 --- a/scripts/ffmpeg-config +++ b/scripts/ffmpeg-config @@ -7,7 +7,7 @@ USER_OPTS="$@" if test -f "$BUILD"/ffmpeg_options ; then USER_OPTS="$(cat "$BUILD"/ffmpeg_options) $USER_OPTS" fi -OPTIONS="--enable-gpl --enable-nonfree --disable-debug --disable-doc" +OPTIONS="--enable-gpl --disable-debug --disable-doc" if "$BUILD"/scripts/test-libmpv ; then OPTIONS="$OPTIONS --enable-pic" @@ -19,12 +19,12 @@ OPTIONS="$OPTIONS $USER_OPTS" if ! ( echo "$OPTIONS" | grep -e --enable-openssl ) && ! ( echo "$OPTIONS" | grep -e --enable-gnutls ) ; then - if pkg-config openssl ; then - OPTIONS="$OPTIONS --enable-openssl" - echo "Auto-enabling OpenSSL (creates a non-redistributable binary)." - elif pkg-config gnutls ; then + if pkg-config gnutls ; then OPTIONS="$OPTIONS --enable-gnutls" echo "Auto-enabling GnuTLS." + elif pkg-config openssl ; then + OPTIONS="$OPTIONS --enable-nonfree --enable-openssl" + echo "Auto-enabling OpenSSL (creates a non-redistributable binary)." fi fi |