Commit 88c73cf0 authored by diego's avatar diego

100l: Revert removal of GPL check for libswscale.

libswscale still compiles GPL parts by default.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@17557 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent b6394499
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment