Commit 76022763 authored by Diego Biurrun's avatar Diego Biurrun

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
parent ee8ee340
...@@ -81,7 +81,7 @@ show_help(){ ...@@ -81,7 +81,7 @@ show_help(){
echo " --disable-ffplay disable ffplay build" echo " --disable-ffplay disable ffplay build"
echo " --disable-ffserver disable ffserver build" echo " --disable-ffserver disable ffserver build"
echo " --enable-postproc enable GPLed postprocessing support [no]" 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 video filter support (replaces vhook) [no]"
echo " --enable-avfilter-lavf video filters dependent on avformat [no]" echo " --enable-avfilter-lavf video filters dependent on avformat [no]"
echo " --disable-vhook disable video hooking support" echo " --disable-vhook disable video hooking support"
...@@ -1684,6 +1684,7 @@ if ! enabled gpl; then ...@@ -1684,6 +1684,7 @@ if ! enabled gpl; then
die_gpl_disabled "libxvidcore" libxvid die_gpl_disabled "libxvidcore" libxvid
die_gpl_disabled "FAAD2" libfaad2 die_gpl_disabled "FAAD2" libfaad2
die_gpl_disabled "The X11 grabber" x11grab die_gpl_disabled "The X11 grabber" x11grab
die_gpl_disabled "The software scaler" swscale
fi fi
if ! enabled nonfree && enabled_any libamr_nb libamr_wb; then 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