summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorwd0 <wd@europa>2015-03-29 16:49:22 -0400
committerwd0 <wd@europa>2015-03-29 16:49:22 -0400
commitf0e2af616c443cd798e526ca51de9d7ab3671dab (patch)
treedfab91b894cedd0133be35dfe0b4b9790b7e9d3b /scripts
parent5a7ea7c6dc5b07c22981651675539217b29035fa (diff)
downloadmpv-build-f0e2af616c443cd798e526ca51de9d7ab3671dab.tar.bz2
mpv-build-f0e2af616c443cd798e526ca51de9d7ab3671dab.tar.xz
ffmpeg-config: prefer gnutls and redistribution
Avoid unnecessarily adding --enable-nonfree and prefer gnutls over openssl in configuring ffmpeg.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/ffmpeg-config10
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