[FFmpeg-devel] [PATCH] cmdutils: remove this_year constant, use CONFIG_THIS_YEAR instead

[Clément Bœsch]

On Tue, Nov 26, 2013 at 10:04:07AM +0100, Stefano Sabatini wrote:
> Simplify.
> ---
>  cmdutils.c | 4 +---
>  cmdutils.h | 5 -----
>  ffprobe.c  | 2 +-
>  3 files changed, 2 insertions(+), 9 deletions(-)
> 
> diff --git a/cmdutils.c b/cmdutils.c
> index ebb747a..2608bce 100644
> --- a/cmdutils.c
> +++ b/cmdutils.c
> @@ -69,8 +69,6 @@ struct SwsContext *sws_opts;
>  AVDictionary *swr_opts;
>  AVDictionary *format_opts, *codec_opts, *resample_opts;
>  
> -const int this_year = CONFIG_THIS_YEAR;
> -
>  static FILE *report_file;
>  
>  void init_opts(void)
> @@ -1072,7 +1070,7 @@ static void print_program_info(int flags, int level)
>      av_log(NULL, level, "%s version " FFMPEG_VERSION, program_name);
>      if (flags & SHOW_COPYRIGHT)
>          av_log(NULL, level, " Copyright (c) %d-%d the FFmpeg developers",
> -               program_birth_year, this_year);
> +               program_birth_year, CONFIG_THIS_YEAR);
>      av_log(NULL, level, "\n");
>      av_log(NULL, level, "%sbuilt on %s %s with %s\n",
>             indent, __DATE__, __TIME__, CC_IDENT);
> diff --git a/cmdutils.h b/cmdutils.h
> index ce6660a..b814961 100644
> --- a/cmdutils.h
> +++ b/cmdutils.h
> @@ -43,11 +43,6 @@ extern const char program_name[];
>   */
>  extern const int program_birth_year;
>  
> -/**
> - * this year, defined by the program for show_banner()
> - */
> -extern const int this_year;
> -
>  extern AVCodecContext *avcodec_opts[AVMEDIA_TYPE_NB];
>  extern AVFormatContext *avformat_opts;
>  extern struct SwsContext *sws_opts;
> diff --git a/ffprobe.c b/ffprobe.c
> index 1842452..d124d4e 100644
> --- a/ffprobe.c
> +++ b/ffprobe.c
> @@ -2422,7 +2422,7 @@ static void ffprobe_show_program_version(WriterContext *w)
>      writer_print_section_header(w, SECTION_ID_PROGRAM_VERSION);
>      print_str("version", FFMPEG_VERSION);
>      print_fmt("copyright", "Copyright (c) %d-%d the FFmpeg developers",
> -              program_birth_year, this_year);
> +              program_birth_year, CONFIG_THIS_YEAR);
>      print_str("build_date", __DATE__);
>      print_str("build_time", __TIME__);
>      print_str("compiler_ident", CC_IDENT);

OK

-- 
Clément B.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20131126/eae60c12/attachment.asc>