[FFmpeg-devel] [PATCH]New option hide_banner

[Stefano Sabatini]

On date Saturday 2013-12-28 04:22:59 +0100, Carl Eugen Hoyos encoded:
> From 313f890a8f73a9ca817309515fa9f75600085e97 Mon Sep 17 00:00:00 2001
> From: Carl Eugen Hoyos <cehoyos at minerva.hye>
> Date: Sat, 28 Dec 2013 05:18:39 +0100

> Subject: [PATCH] Allow hiding the banner.

nitt: cmdutils: allow hiding the banner

> 
> Fixes ticket #3246.
> ---
>  cmdutils.c                   |    6 +++++-
>  cmdutils.h                   |    1 +
>  cmdutils_common_opts.h       |    1 +
>  doc/fftools-common-opts.texi |    4 ++++
>  4 files changed, 11 insertions(+), 1 deletions(-)
> 
> diff --git a/cmdutils.c b/cmdutils.c
> index fc4b424..dc9bd2c 100644
> --- a/cmdutils.c
> +++ b/cmdutils.c
> @@ -66,6 +66,7 @@ AVDictionary *swr_opts;
>  AVDictionary *format_opts, *codec_opts, *resample_opts;
>  
>  static FILE *report_file;

> +int hide_banner = 0;

Or alternatively: do_show_banner = 1;

>  
>  void init_opts(void)
>  {
> @@ -491,6 +492,9 @@ void parse_loglevel(int argc, char **argv, const OptionDef *options)
>              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,
> @@ -1083,7 +1087,7 @@ static void print_buildconf(int flags, int level)
>  void show_banner(int argc, char **argv, const OptionDef *options)
>  {
>      int idx = locate_option(argc, argv, options, "version");
> -    if (idx)
> +    if (hide_banner || idx)
>          return;
>  
>      print_program_info (INDENT|SHOW_COPYRIGHT, AV_LOG_INFO);
> diff --git a/cmdutils.h b/cmdutils.h
> index f4f23ef..d1e1ecb 100644
> --- a/cmdutils.h
> +++ b/cmdutils.h
> @@ -48,6 +48,7 @@ extern AVFormatContext *avformat_opts;
>  extern struct SwsContext *sws_opts;
>  extern AVDictionary *swr_opts;
>  extern AVDictionary *format_opts, *codec_opts, *resample_opts;
> +extern int hide_banner;
>  
>  /**
>   * Register a program-specific cleanup routine.
> diff --git a/cmdutils_common_opts.h b/cmdutils_common_opts.h
> index 685163e..77675bb 100644
> --- a/cmdutils_common_opts.h
> +++ b/cmdutils_common_opts.h
> @@ -21,6 +21,7 @@
>      { "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" },
>      { "cpuflags"   , HAS_ARG | OPT_EXPERT, { .func_arg = opt_cpuflags }, "force specific cpu flags", "flags" },
> +    { "hide_banner", OPT_BOOL, {&hide_banner},                  "do not show program banner", "hide_banner" },
>  #if CONFIG_OPENCL
>      { "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" },
> diff --git a/doc/fftools-common-opts.texi b/doc/fftools-common-opts.texi
> index ff6478a..c91e296 100644
> --- a/doc/fftools-common-opts.texi
> +++ b/doc/fftools-common-opts.texi
> @@ -194,6 +194,10 @@ to a plain @code{%}
>  Errors in parsing the environment variable are not fatal, and will not
>  appear in the report.
>  

> + at item -hide_banner
> +All tools will normally show a copyright notice, build options and 
> +library versions. Use -hide_banner to suppress these informations.

@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.

[...]

LGTM otherwise.
-- 
FFmpeg = Faithless and Frenzy Mastodontic Practical Elected Gnome