aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2011-05-12 13:21:49 +0100
committerDiego Biurrun <diego@biurrun.de>2011-05-12 15:32:57 +0200
commitced9556b6189de67dd740f5231c6f1807f3e3704 (patch)
treee3691d81d4589cbdb2a7de2a3b5553123545efaf
parente575685fad342b9a31e89c3897f7e105811f5194 (diff)
downloadffmpeg-ced9556b6189de67dd740f5231c6f1807f3e3704.tar.gz
configure: Enable libpostproc automatically if GPL code is enabled.
Enabling libpostproc automatically should give it more compile coverage and save the FATE box maintainers some configuration hassles.
-rwxr-xr-xconfigure5
1 files changed, 3 insertions, 2 deletions
diff --git a/configure b/configure
index d551379da4..126a6b551c 100755
--- a/configure
+++ b/configure
@@ -88,7 +88,7 @@ Configuration options:
--disable-avcodec disable libavcodec build
--disable-avformat disable libavformat build
--disable-swscale disable libswscale build
- --enable-postproc enable GPLed postprocessing support [no]
+ --disable-postproc disable libpostproc build
--disable-avfilter disable video filter support [no]
--disable-pthreads disable pthreads [auto]
--enable-w32threads use Win32 threads [no]
@@ -1474,6 +1474,7 @@ yadif_filter_deps="gpl"
# libraries
avdevice_deps="avcodec avformat"
avformat_deps="avcodec"
+postproc_deps="gpl"
# programs
ffmpeg_deps="avcodec avformat swscale"
@@ -1643,6 +1644,7 @@ enable ffprobe
enable ffserver
enable network
enable optimizations
+enable postproc
enable protocols
enable static
enable swscale
@@ -2531,7 +2533,6 @@ die_license_disabled() {
die_license_disabled gpl libx264
die_license_disabled gpl libxavs
die_license_disabled gpl libxvid
-die_license_disabled gpl postproc
die_license_disabled gpl x11grab
die_license_disabled nonfree libfaac