From: Diego Biurrun Date: Wed, 30 Jan 2008 08:07:18 +0000 (+0000) Subject: Do not print an (L)GPL license statement when nonfree parts have been compiled X-Git-Tag: v0.5~6300 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=7ead693b79cd5e3baa88f863e4324588e8bdc243;ds=sidebyside Do not print an (L)GPL license statement when nonfree parts have been compiled into FFmpeg. Instead warn that the resulting binary is unredistributable. Originally committed as revision 11666 to svn://svn.ffmpeg.org/ffmpeg/trunk --- diff --git a/cmdutils.c b/cmdutils.c index 86efa79ef4..abd10c50af 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -184,7 +184,12 @@ void show_version(const char *program_name) { void show_license(void) { -#ifdef CONFIG_GPL +#ifdef CONFIG_NONFREE + printf( + "This version of FFmpeg has nonfree parts compiled in.\n" + "Therefore it is not legally redistributable.\n" + ); +#elif CONFIG_GPL printf( "FFmpeg is free software; you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n"