summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRudolf Polzer <divverent@xonotic.org>2013-06-21 13:00:01 +0200
committerRudolf Polzer <divverent@xonotic.org>2013-06-21 13:00:01 +0200
commit2e1ff8c433fbbd3384664bc30310333cfae0f5f9 (patch)
tree8b08fa6f50877ec64158a67caf6f7089c9a709f0
parent24aabc0a0690b21e6b5802b05969ef6f2dbd0107 (diff)
downloadmpv-build-2e1ff8c433fbbd3384664bc30310333cfae0f5f9.tar.bz2
mpv-build-2e1ff8c433fbbd3384664bc30310333cfae0f5f9.tar.xz
ffmpeg-config: remove needless --enable-nonfree flag; add example flags
This removes the needlessly enabled --enable-nonfree flag, and also adds commented out lines to add libx264, libmp3lame and libfdk_aac support to the ffmpeg used for building mpv.
-rwxr-xr-xscripts/ffmpeg-config7
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/ffmpeg-config b/scripts/ffmpeg-config
index e94dd1f..2e2bfc7 100755
--- a/scripts/ffmpeg-config
+++ b/scripts/ffmpeg-config
@@ -1,7 +1,12 @@
#!/bin/sh
set -e
-OPTIONS="--enable-gpl --enable-nonfree --enable-avresample --disable-debug --disable-doc"
+OPTIONS="--enable-gpl --enable-avresample --disable-debug --disable-doc"
+
+# optional flags for encoding (uncomment if you want to support these encoders)
+#OPTIONS="$OPTIONS --enable-libx264"
+#OPTIONS="$OPTIONS --enable-libmp3lame"
+#OPTIONS="$OPTIONS --enable-nonfree --enable-libfdk-aac"
BUILD="$(pwd)"
mkdir -p "$BUILD"/ffmpeg_build