From 760227633d149ea81444297eaa672b15d9cd176d Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 24 Feb 2009 15:33:39 +0000 Subject: 100l: Revert removal of GPL check for libswscale. libswscale still compiles GPL parts by default. Originally committed as revision 17557 to svn://svn.ffmpeg.org/ffmpeg/trunk --- configure | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 5c055dc302..a8d094f40d 100755 --- a/configure +++ b/configure @@ -81,7 +81,7 @@ show_help(){ echo " --disable-ffplay disable ffplay build" echo " --disable-ffserver disable ffserver build" echo " --enable-postproc enable GPLed postprocessing support [no]" - echo " --enable-swscale enable software scaler support [no]" + echo " --enable-swscale enable GPLed software scaler support [no]" echo " --enable-avfilter video filter support (replaces vhook) [no]" echo " --enable-avfilter-lavf video filters dependent on avformat [no]" echo " --disable-vhook disable video hooking support" @@ -1684,6 +1684,7 @@ if ! enabled gpl; then die_gpl_disabled "libxvidcore" libxvid die_gpl_disabled "FAAD2" libfaad2 die_gpl_disabled "The X11 grabber" x11grab + die_gpl_disabled "The software scaler" swscale fi if ! enabled nonfree && enabled_any libamr_nb libamr_wb; then -- cgit v1.2.3