diff options
author | Benoit Fouet <benoit.fouet@free.fr> | 2007-08-07 14:09:18 +0000 |
---|---|---|
committer | Benoit Fouet <benoit.fouet@free.fr> | 2007-08-07 14:09:18 +0000 |
commit | 9895ebe4f50d02e0a51c3af53c39a986bb6deedf (patch) | |
tree | c63c611ac1f9432a53bf3641b28c8e6bf01a682e | |
parent | 92df8910015421fc0a65905a73ba323dd3391f28 (diff) | |
download | ffmpeg-9895ebe4f50d02e0a51c3af53c39a986bb6deedf.tar.gz |
Avoid showing banner twice.
Originally committed as revision 9980 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | ffmpeg.c | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -3711,7 +3711,6 @@ static void show_banner(void) static void show_license(void) { - show_banner(); #ifdef CONFIG_GPL printf( "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) { av_log_set_callback(log_callback_help); - show_banner(); printf("usage: ffmpeg [[infile options] -i infile]... {[outfile options] outfile}...\n" "Hyper fast Audio and Video encoder\n"); printf("\n"); @@ -3812,10 +3810,9 @@ int main(int argc, char **argv) avformat_opts = av_alloc_format_context(); sws_opts = sws_getContext(16,16,0, 16,16,0, sws_flags, NULL,NULL,NULL); + show_banner(); if (argc <= 1) show_help(); - else - show_banner(); /* parse options */ parse_options(argc, argv, options); |