highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make ffserver use cmdutils.c show_license function

Browse Source 
patch by Stefano Sabatini: [stefano sabatini minus lala ! poste it]

Originally committed as revision 10183 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini
2007-08-22 13:10:25 +00:00
committed by Benoit Fouet
parent d16069952e
commit 4ce5df0856
2 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -81,8 +81,8 @@ endif
ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
$(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(EXTRALIBS) $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(EXTRALIBS)
ffserver$(EXESUF): ffserver.o .libs ffserver$(EXESUF): ffserver.o cmdutils.o .libs
$(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ ffserver.o $(EXTRALIBS) $(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ ffserver.o cmdutils.o $(EXTRALIBS)
ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
$(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(EXTRALIBS) $(SDL_LIBS) $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(EXTRALIBS) $(SDL_LIBS)

22
ffserver.c
View File

@@ -49,6 +49,7 @@
#include "ffserver.h" #include "ffserver.h"
#include "random.h" #include "random.h"
#include "avstring.h" #include "avstring.h"
#include "cmdutils.h"
#undef exit #undef exit
@@ -4318,26 +4319,6 @@ static void show_help(void)
); );
} }
static void show_license(void)
{
show_banner();
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"
);
}
static void handle_child_exit(int sig) static void handle_child_exit(int sig)
{ {
pid_t pid; pid_t pid;
@@ -4383,6 +4364,7 @@ int main(int argc, char **argv)
break; break;
switch(c) { switch(c) {
case 'L': case 'L':
show_banner();
show_license(); show_license();
exit(0); exit(0);
case '?': case '?':