summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2007-08-22 13:04:49 +0000
committerBenoit Fouet <benoit.fouet@free.fr>2007-08-22 13:04:49 +0000
commitd16069952e34a5840cf1bf8c8ac140050e156643 (patch)
tree5141c975953db1871e6289401d2e95202b209fe4 /ffmpeg.c
parentd55388d0282ab5fe5f8ce08ed451042b08403721 (diff)
Make ffmpeg use cmdutils.c show_license function
patch by Stefano Sabatini: [stefano sabatini minus lala ! poste it] Originally committed as revision 10182 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c34
1 files changed, 1 insertions, 33 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index a7e1fc842e..711a18f4f5 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3742,39 +3742,7 @@ static void show_banner(void)
static void opt_show_license(void)
{
-#ifdef 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"
- "the Free Software Foundation; either version 2 of the License, or\n"
- "(at your option) any later version.\n"
- "\n"
- "FFmpeg is distributed in the hope that it will be useful,\n"
- "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
- "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
- "GNU General Public License for more details.\n"
- "\n"
- "You should have received a copy of the GNU General Public License\n"
- "along with FFmpeg; if not, write to the Free Software\n"
- "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n"
- );
-#else
- printf(
- "FFmpeg is free software; you can redistribute it and/or\n"
- "modify it under the terms of the GNU Lesser General Public\n"
- "License as published by the Free Software Foundation; either\n"
- "version 2.1 of the License, or (at your option) any later version.\n"
- "\n"
- "FFmpeg is distributed in the hope that it will be useful,\n"
- "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
- "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
- "Lesser General Public License for more details.\n"
- "\n"
- "You should have received a copy of the GNU Lesser General Public\n"
- "License along with FFmpeg; if not, write to the Free Software\n"
- "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n"
- );
-#endif
+ show_license();
exit(0);
}