Commit ea9c581f authored by Stefano Sabatini's avatar Stefano Sabatini Committed by Diego Biurrun
Browse files

Simplify show_banner() so that it does not require arguments, similar

to what was previously done with show_version().
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13526 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 9667a2d2
......@@ -196,7 +196,7 @@ void print_error(const char *filename, int err)
}
}
void show_banner(const char *program_name, int program_birth_year)
void show_banner(void)
{
fprintf(stderr, "%s version " FFMPEG_VERSION ", Copyright (c) %d-2008 Fabrice Bellard, et al.\n",
program_name, program_birth_year);
......
......@@ -29,6 +29,11 @@
*/
extern const char program_name[];
/**
* program birth year, defined by the program for show_banner()
*/
extern const int program_birth_year;
/**
* Parses a string and returns its corresponding value as a double.
* Exits from the application if the string cannot be correctly
......@@ -107,10 +112,8 @@ void print_error(const char *filename, int err);
* Prints the program banner to stderr. The banner contents depend on the
* current version of the repository and of the libav* libraries used by
* the program.
* @param program_name name of the program
* @param program_birth_year year of birth of the program
*/
void show_banner(const char *program_name, int program_birth_year);
void show_banner(void);
/**
* Prints the version of the program to stdout. The version message
......
......@@ -64,7 +64,7 @@
#undef exit
const char program_name[] = "FFmpeg";
static const int program_birth_year = 2000;
const int program_birth_year = 2000;
/* select an input stream for an output stream */
typedef struct AVStreamMap {
......@@ -3777,7 +3777,7 @@ 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(program_name, program_birth_year);
show_banner();
if (argc <= 1) {
show_help();
av_exit(1);
......
......@@ -40,7 +40,7 @@
#undef exit
const char program_name[] = "FFplay";
static const int program_birth_year = 2003;
const int program_birth_year = 2003;
//#define DEBUG_SYNC
......@@ -2509,7 +2509,7 @@ int main(int argc, char **argv)
avdevice_register_all();
av_register_all();
show_banner(program_name, program_birth_year);
show_banner();
parse_options(argc, argv, options, opt_input_file);
......
......@@ -57,7 +57,7 @@
#undef exit
const char program_name[] = "FFserver";
static const int program_birth_year = 2000;
const int program_birth_year = 2000;
static const OptionDef options[];
......@@ -4361,7 +4361,7 @@ int main(int argc, char **argv)
av_register_all();
show_banner(program_name, program_birth_year);
show_banner();
config_filename = "/etc/ffserver.conf";
......
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