generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmdutils: remove this_year constant, use CONFIG_THIS_YEAR instead

Browse Source 
Simplify.
This commit is contained in:
Stefano Sabatini
2013-11-26 10:03:32 +01:00
parent 4c4710a745
commit 8bf7ea8ac2
3 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmdutils.c
View File

@@ -69,8 +69,6 @@ struct SwsContext *sws_opts;
AVDictionary *swr_opts; AVDictionary *swr_opts;
AVDictionary *format_opts, *codec_opts, *resample_opts; AVDictionary *format_opts, *codec_opts, *resample_opts;
const int this_year = CONFIG_THIS_YEAR;
static FILE *report_file; static FILE *report_file;
void init_opts(void) 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); av_log(NULL, level, "%s version " FFMPEG_VERSION, program_name);
if (flags & SHOW_COPYRIGHT) if (flags & SHOW_COPYRIGHT)
av_log(NULL, level, " Copyright (c) %d-%d the FFmpeg developers", 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, "\n");
av_log(NULL, level, "%sbuilt on %s %s with %s\n", av_log(NULL, level, "%sbuilt on %s %s with %s\n",
indent, __DATE__, __TIME__, CC_IDENT); indent, __DATE__, __TIME__, CC_IDENT);

5
cmdutils.h
View File

@@ -43,11 +43,6 @@ extern const char program_name[];
*/ */
extern const int program_birth_year; 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 AVCodecContext *avcodec_opts[AVMEDIA_TYPE_NB];
extern AVFormatContext *avformat_opts; extern AVFormatContext *avformat_opts;
extern struct SwsContext *sws_opts; extern struct SwsContext *sws_opts;

2
ffprobe.c
View File

@@ -2422,7 +2422,7 @@ static void ffprobe_show_program_version(WriterContext *w)
writer_print_section_header(w, SECTION_ID_PROGRAM_VERSION); writer_print_section_header(w, SECTION_ID_PROGRAM_VERSION);
print_str("version", FFMPEG_VERSION); print_str("version", FFMPEG_VERSION);
print_fmt("copyright", "Copyright (c) %d-%d the FFmpeg developers", 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_date", __DATE__);
print_str("build_time", __TIME__); print_str("build_time", __TIME__);
print_str("compiler_ident", CC_IDENT); print_str("compiler_ident", CC_IDENT);