aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2016-06-25 11:01:50 +0200
committerClément Bœsch <u@pkh.me>2016-06-25 11:01:50 +0200
commit680ec710ec4b6f639eb0eac87129926aceea6e8d (patch)
treee97892be0641d4a3d96f031f516a8cbc0b9b0578
parentb45348130a60702010a7da0113c34c4df54c27f8 (diff)
parent5e2203448ab4cc8ea1d933b87f1b39b009201044 (diff)
downloadffmpeg-680ec710ec4b6f639eb0eac87129926aceea6e8d.tar.gz
Merge commit '5e2203448ab4cc8ea1d933b87f1b39b009201044'
* commit '5e2203448ab4cc8ea1d933b87f1b39b009201044': configure: improve the help text for external libraries Only merged the explanation paragraphs. The removal of "enable/disable" and "[no]" would create too much inconsistency and might cause confusion. Merged-by: Clément Bœsch <u@pkh.me>
-rwxr-xr-xconfigure14
1 files changed, 14 insertions, 0 deletions
diff --git a/configure b/configure
index 3787894d1d..7d2f1eb6c5 100755
--- a/configure
+++ b/configure
@@ -203,6 +203,20 @@ Individual component options:
--disable-filters disable all filters
External library support:
+
+ Using any of the following switches will allow FFmpeg to link to the
+ corresponding external library. All the components depending on that library
+ will become enabled, if all their other dependencies are met and they are not
+ explicitly disabled. E.g. --enable-libwavpack will enable linking to
+ libwavpack and allow the libwavpack encoder to be built, unless it is
+ specifically disabled with --disable-encoder=libwavpack.
+
+ Note that only the system libraries are auto-detected. All the other external
+ libraries must be explicitly enabled.
+
+ Also note that the following help text describes the purpose of the libraries
+ themselves, not all their features will necessarily be usable by FFmpeg.
+
--disable-audiotoolbox enable AudioToolbox decoders and encoders [autodetect]
--enable-avisynth enable reading of AviSynth script files [no]
--disable-bzlib disable bzlib [autodetect]