Commit b4c89c90 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos Committed by Carl Eugen Hoyos

Allow hiding the banner.

Fixes ticket #3246.
parent 9ed64001
...@@ -66,6 +66,7 @@ AVDictionary *swr_opts; ...@@ -66,6 +66,7 @@ AVDictionary *swr_opts;
AVDictionary *format_opts, *codec_opts, *resample_opts; AVDictionary *format_opts, *codec_opts, *resample_opts;
static FILE *report_file; static FILE *report_file;
int hide_banner = 0;
void init_opts(void) void init_opts(void)
{ {
...@@ -491,6 +492,9 @@ void parse_loglevel(int argc, char **argv, const OptionDef *options) ...@@ -491,6 +492,9 @@ void parse_loglevel(int argc, char **argv, const OptionDef *options)
fflush(report_file); fflush(report_file);
} }
} }
idx = locate_option(argc, argv, options, "hide_banner");
if (idx)
hide_banner = 1;
} }
static const AVOption *opt_find(void *obj, const char *name, const char *unit, static const AVOption *opt_find(void *obj, const char *name, const char *unit,
...@@ -1083,7 +1087,7 @@ static void print_buildconf(int flags, int level) ...@@ -1083,7 +1087,7 @@ static void print_buildconf(int flags, int level)
void show_banner(int argc, char **argv, const OptionDef *options) void show_banner(int argc, char **argv, const OptionDef *options)
{ {
int idx = locate_option(argc, argv, options, "version"); int idx = locate_option(argc, argv, options, "version");
if (idx) if (hide_banner || idx)
return; return;
print_program_info (INDENT|SHOW_COPYRIGHT, AV_LOG_INFO); print_program_info (INDENT|SHOW_COPYRIGHT, AV_LOG_INFO);
......
...@@ -48,6 +48,7 @@ extern AVFormatContext *avformat_opts; ...@@ -48,6 +48,7 @@ extern AVFormatContext *avformat_opts;
extern struct SwsContext *sws_opts; extern struct SwsContext *sws_opts;
extern AVDictionary *swr_opts; extern AVDictionary *swr_opts;
extern AVDictionary *format_opts, *codec_opts, *resample_opts; extern AVDictionary *format_opts, *codec_opts, *resample_opts;
extern int hide_banner;
/** /**
* Register a program-specific cleanup routine. * Register a program-specific cleanup routine.
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
{ "report" , 0, {(void*)opt_report}, "generate a report" }, { "report" , 0, {(void*)opt_report}, "generate a report" },
{ "max_alloc" , HAS_ARG, {.func_arg = opt_max_alloc}, "set maximum size of a single allocated block", "bytes" }, { "max_alloc" , HAS_ARG, {.func_arg = opt_max_alloc}, "set maximum size of a single allocated block", "bytes" },
{ "cpuflags" , HAS_ARG | OPT_EXPERT, { .func_arg = opt_cpuflags }, "force specific cpu flags", "flags" }, { "cpuflags" , HAS_ARG | OPT_EXPERT, { .func_arg = opt_cpuflags }, "force specific cpu flags", "flags" },
{ "hide_banner", OPT_BOOL | OPT_EXPERT, {&hide_banner}, "do not show program banner", "hide_banner" },
#if CONFIG_OPENCL #if CONFIG_OPENCL
{ "opencl_bench", OPT_EXIT, {.func_arg = opt_opencl_bench}, "run benchmark on all OpenCL devices and show results" }, { "opencl_bench", OPT_EXIT, {.func_arg = opt_opencl_bench}, "run benchmark on all OpenCL devices and show results" },
{ "opencl_options", HAS_ARG, {.func_arg = opt_opencl}, "set OpenCL environment options" }, { "opencl_options", HAS_ARG, {.func_arg = opt_opencl}, "set OpenCL environment options" },
......
...@@ -194,6 +194,13 @@ to a plain @code{%} ...@@ -194,6 +194,13 @@ to a plain @code{%}
Errors in parsing the environment variable are not fatal, and will not Errors in parsing the environment variable are not fatal, and will not
appear in the report. appear in the report.
@item -hide_banner
Suppress printing banner.
All FFmpeg tools will normally show a copyright notice, build options
and library versions. This option can be used to suppress printing
this information.
@item -cpuflags flags (@emph{global}) @item -cpuflags flags (@emph{global})
Allows setting and clearing cpu flags. This option is intended Allows setting and clearing cpu flags. This option is intended
for testing. Do not use it unless you know what you're doing. for testing. Do not use it unless you know what you're doing.
......
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