Revision 4ce5df08

View differences:

Makefile
81 81
ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
82 82
	$(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(EXTRALIBS)
83 83

  
84
ffserver$(EXESUF): ffserver.o .libs
85
	$(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ ffserver.o $(EXTRALIBS)
84
ffserver$(EXESUF): ffserver.o cmdutils.o .libs
85
	$(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ ffserver.o cmdutils.o $(EXTRALIBS)
86 86

  
87 87
ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
88 88
	$(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(EXTRALIBS) $(SDL_LIBS)
ffserver.c
49 49
#include "ffserver.h"
50 50
#include "random.h"
51 51
#include "avstring.h"
52
#include "cmdutils.h"
52 53

  
53 54
#undef exit
54 55

  
......
4318 4319
           );
4319 4320
}
4320 4321

  
4321
static void show_license(void)
4322
{
4323
    show_banner();
4324
    printf(
4325
    "FFmpeg is free software; you can redistribute it and/or\n"
4326
    "modify it under the terms of the GNU Lesser General Public\n"
4327
    "License as published by the Free Software Foundation; either\n"
4328
    "version 2.1 of the License, or (at your option) any later version.\n"
4329
    "\n"
4330
    "FFmpeg is distributed in the hope that it will be useful,\n"
4331
    "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
4332
    "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
4333
    "Lesser General Public License for more details.\n"
4334
    "\n"
4335
    "You should have received a copy of the GNU Lesser General Public\n"
4336
    "License along with FFmpeg; if not, write to the Free Software\n"
4337
    "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n"
4338
    );
4339
}
4340

  
4341 4322
static void handle_child_exit(int sig)
4342 4323
{
4343 4324
    pid_t pid;
......
4383 4364
            break;
4384 4365
        switch(c) {
4385 4366
        case 'L':
4367
            show_banner();
4386 4368
            show_license();
4387 4369
            exit(0);
4388 4370
        case '?':

Also available in: Unified diff