diff options
author | Diego Biurrun <diego@biurrun.de> | 2008-01-26 13:24:32 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2008-01-26 13:24:32 +0000 |
commit | 3fe142e2555ec8b527f2ff4cc517c015a114e91a (patch) | |
tree | cbb676172a6637a94ca80e8feba36e9de9dedf79 /configure | |
parent | 64e13d69145db9c1f6f2a0bc133c8ea6d9630b85 (diff) | |
download | ffmpeg-streaming-3fe142e2555ec8b527f2ff4cc517c015a114e91a.zip ffmpeg-streaming-3fe142e2555ec8b527f2ff4cc517c015a114e91a.tar.gz |
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
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 15 |
1 files changed, 12 insertions, 3 deletions
@@ -68,6 +68,8 @@ show_help(){ echo " --disable-shared do not build shared libraries [default=yes]" echo " --enable-gpl allow use of GPL code, the resulting libav*" 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-swscaler software scaler support [default=no]" echo " --enable-beosthreads use BeOS threads [default=no]" @@ -650,6 +652,7 @@ CONFIG_LIST=" memalign_hack mpegaudio_hp network + nonfree powerpc_perf pp small @@ -1355,6 +1358,10 @@ if ! enabled gpl; then die_gpl_disabled "The software scaler" swscaler 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 test -z "$need_memalign" && need_memalign="$mmx" @@ -1928,9 +1935,11 @@ for type in decoder encoder parser demuxer muxer protocol bsf indev outdev; do echo $partlist done -enabled gpl && - echo "License: GPL" || - echo "License: LGPL" +enabled nonfree && + echo "License: unredistributable" || + (enabled gpl && + echo "License: GPL" || + echo "License: LGPL") echo "Creating config.mak and config.h..." |