Commit 3fe142e2 authored by Diego Biurrun's avatar Diego Biurrun
Browse files

Add a --enable-nonfree command line parameter similar to --enable-gpl.

Required to enable nonfree libraries that make FFmpeg unredistributable.

Originally committed as revision 11617 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 64e13d69
...@@ -68,6 +68,8 @@ show_help(){ ...@@ -68,6 +68,8 @@ show_help(){
echo " --disable-shared do not build shared libraries [default=yes]" echo " --disable-shared do not build shared libraries [default=yes]"
echo " --enable-gpl allow use of GPL code, the resulting libav*" echo " --enable-gpl allow use of GPL code, the resulting libav*"
echo " and ffmpeg will be under GPL [default=no]" echo " and ffmpeg will be under GPL [default=no]"
echo " --enable-nonfree allow use of nonfree code, the resulting libav*"
echo " and ffmpeg will be unredistributable [default=no]"
echo " --enable-pp enable GPLed postprocessing support [default=no]" echo " --enable-pp enable GPLed postprocessing support [default=no]"
echo " --enable-swscaler software scaler support [default=no]" echo " --enable-swscaler software scaler support [default=no]"
echo " --enable-beosthreads use BeOS threads [default=no]" echo " --enable-beosthreads use BeOS threads [default=no]"
...@@ -650,6 +652,7 @@ CONFIG_LIST=" ...@@ -650,6 +652,7 @@ CONFIG_LIST="
memalign_hack memalign_hack
mpegaudio_hp mpegaudio_hp
network network
nonfree
powerpc_perf powerpc_perf
pp pp
small small
...@@ -1355,6 +1358,10 @@ if ! enabled gpl; then ...@@ -1355,6 +1358,10 @@ if ! enabled gpl; then
die_gpl_disabled "The software scaler" swscaler die_gpl_disabled "The software scaler" swscaler
fi fi
if ! enabled nonfree && enabled_any libamr_nb libamr_wb; then
die "libamr is nonfree and --enable-nonfree is not specified."
fi
check_deps $ARCH_EXT_LIST check_deps $ARCH_EXT_LIST
test -z "$need_memalign" && need_memalign="$mmx" test -z "$need_memalign" && need_memalign="$mmx"
...@@ -1928,9 +1935,11 @@ for type in decoder encoder parser demuxer muxer protocol bsf indev outdev; do ...@@ -1928,9 +1935,11 @@ for type in decoder encoder parser demuxer muxer protocol bsf indev outdev; do
echo $partlist echo $partlist
done done
enabled gpl && enabled nonfree &&
echo "License: GPL" || echo "License: unredistributable" ||
echo "License: LGPL" (enabled gpl &&
echo "License: GPL" ||
echo "License: LGPL")
echo "Creating config.mak and config.h..." echo "Creating config.mak and config.h..."
......
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