Commit 1af2ca78 authored by Stefano Sabatini's avatar Stefano Sabatini Committed by Benoit Fouet

Prefix with "opt_" the functions ffmpeg.c:show_{version,license,formats}.

patch by Stefano Sabatini [stefano tod sabatini-lala £ poste it]

Originally committed as revision 10049 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 63f81659
...@@ -80,7 +80,7 @@ typedef struct AVMetaDataMap { ...@@ -80,7 +80,7 @@ typedef struct AVMetaDataMap {
extern const OptionDef options[]; extern const OptionDef options[];
static void show_help(void); static void show_help(void);
static void show_license(void); static void opt_show_license(void);
static int opt_default(const char *opt, const char *arg); static int opt_default(const char *opt, const char *arg);
#define MAX_FILES 20 #define MAX_FILES 20
...@@ -3187,7 +3187,7 @@ static int64_t getutime(void) ...@@ -3187,7 +3187,7 @@ static int64_t getutime(void)
extern int ffm_nopts; extern int ffm_nopts;
#endif #endif
static void show_formats(void) static void opt_show_formats(void)
{ {
AVInputFormat *ifmt; AVInputFormat *ifmt;
AVOutputFormat *ofmt; AVOutputFormat *ofmt;
...@@ -3536,7 +3536,7 @@ static void opt_audio_bsf(const char *arg) ...@@ -3536,7 +3536,7 @@ static void opt_audio_bsf(const char *arg)
*bsfp= bsfc; *bsfp= bsfc;
} }
static void show_version(void) static void opt_show_version(void)
{ {
/* TODO: add function interface to avutil and avformat */ /* TODO: add function interface to avutil and avformat */
fprintf(stderr, "ffmpeg " FFMPEG_VERSION "\n" fprintf(stderr, "ffmpeg " FFMPEG_VERSION "\n"
...@@ -3591,10 +3591,10 @@ static int opt_default(const char *opt, const char *arg){ ...@@ -3591,10 +3591,10 @@ static int opt_default(const char *opt, const char *arg){
const OptionDef options[] = { const OptionDef options[] = {
/* main options */ /* main options */
{ "L", 0, {(void*)show_license}, "show license" }, { "L", 0, {(void*)opt_show_license}, "show license" },
{ "h", 0, {(void*)opt_show_help}, "show help" }, { "h", 0, {(void*)opt_show_help}, "show help" },
{ "version", 0, {(void*)show_version}, "show version" }, { "version", 0, {(void*)opt_show_version}, "show version" },
{ "formats", 0, {(void*)show_formats}, "show available formats, codecs, protocols, ..." }, { "formats", 0, {(void*)opt_show_formats}, "show available formats, codecs, protocols, ..." },
{ "f", HAS_ARG, {(void*)opt_format}, "force format", "fmt" }, { "f", HAS_ARG, {(void*)opt_format}, "force format", "fmt" },
{ "i", HAS_ARG, {(void*)opt_input_file}, "input file name", "filename" }, { "i", HAS_ARG, {(void*)opt_input_file}, "input file name", "filename" },
{ "y", OPT_BOOL, {(void*)&file_overwrite}, "overwrite output files" }, { "y", OPT_BOOL, {(void*)&file_overwrite}, "overwrite output files" },
...@@ -3725,7 +3725,7 @@ static void show_banner(void) ...@@ -3725,7 +3725,7 @@ static void show_banner(void)
#endif #endif
} }
static void show_license(void) static void opt_show_license(void)
{ {
#ifdef CONFIG_GPL #ifdef CONFIG_GPL
printf( printf(
......
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