Commit 3437ca38 authored by benoit's avatar benoit

Avoid showing banner twice.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@9980 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 41fa59da
...@@ -3711,7 +3711,6 @@ static void show_banner(void) ...@@ -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) ...@@ -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) ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment