generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid showing banner twice.

Browse Source 
Originally committed as revision 9980 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Benoit Fouet 2007-08-07 14:09:18 +00:00
parent 92df891001
commit 9895ebe4f5
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ffmpeg.c
View File

@ -3711,7 +3711,6 @@ static void show_banner(void)
static void show_license(void) static void show_license(void)
{ {
show_banner();
#ifdef CONFIG_GPL #ifdef CONFIG_GPL
printf( printf(
"FFmpeg is free software; you can redistribute it and/or modify\n" "FFmpeg is free software; you can redistribute it and/or modify\n"
@ -3760,7 +3759,6 @@ static void log_callback_help(void* ptr, int level, const char* fmt, va_list vl)
static void show_help(void) static void show_help(void)
{ {
av_log_set_callback(log_callback_help); av_log_set_callback(log_callback_help);
show_banner();
printf("usage: ffmpeg [[infile options] -i infile]... {[outfile options] outfile}...\n" printf("usage: ffmpeg [[infile options] -i infile]... {[outfile options] outfile}...\n"
"Hyper fast Audio and Video encoder\n"); "Hyper fast Audio and Video encoder\n");
printf("\n"); printf("\n");
@ -3812,10 +3810,9 @@ int main(int argc, char **argv)
avformat_opts = av_alloc_format_context(); avformat_opts = av_alloc_format_context();
sws_opts = sws_getContext(16,16,0, 16,16,0, sws_flags, NULL,NULL,NULL); sws_opts = sws_getContext(16,16,0, 16,16,0, sws_flags, NULL,NULL,NULL);
show_banner();
if (argc <= 1) if (argc <= 1)
show_help(); show_help();
else
show_banner();
/* parse options */ /* parse options */
parse_options(argc, argv, options); parse_options(argc, argv, options);