diff options
author | Diego Biurrun <diego@biurrun.de> | 2009-02-24 15:11:45 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2009-02-24 15:11:45 +0000 |
commit | f83a40985ca5ae799253a665d72f5a2fa997798d (patch) | |
tree | 496ac1c7d8da36b58d2a21c6a0028e9636c02668 | |
parent | ad48c9f0b833c61ee6b883b9492d79d0a449ee44 (diff) | |
download | ffmpeg-f83a40985ca5ae799253a665d72f5a2fa997798d.tar.gz |
The software scaler is no longer GPLed.
Originally committed as revision 17556 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-x | configure | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -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 GPLed software scaler support [no]" + echo " --enable-swscale enable 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,7 +1684,6 @@ 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 |