diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-19 21:58:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-19 22:01:31 +0200 |
| commit | 85044358f63f0158fb83712f659f6db5b454a7aa (patch) | |
| tree | a29d74d69c953be07f3049542afb5659c8e87775 /cmdutils.c | |
| parent | 55ed91c8565a3c562d2982e1cd5e66df06c6c190 (diff) | |
| parent | 45870f8b6eb3529992a4315a6957150124d7ca03 (diff) | |
| download | ffmpeg-85044358f63f0158fb83712f659f6db5b454a7aa.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Print full compiler identification, not only version number
flacdec: reverse lpc coeff order, simplify filter
x86: dsputil: drop some unused CPU flag debug code
Conflicts:
cmdutils.c
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
| -rw-r--r-- | cmdutils.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmdutils.c b/cmdutils.c index e90a9ee6fb..5fdb1a6ba2 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -655,8 +655,9 @@ static void print_program_info(int flags, int level) av_log(NULL, level, " Copyright (c) %d-%d the FFmpeg developers", program_birth_year, this_year); av_log(NULL, level, "\n"); - av_log(NULL, level, "%sbuilt on %s %s with %s %s\n", - indent, __DATE__, __TIME__, CC_TYPE, CC_VERSION); + av_log(NULL, level, "%sbuilt on %s %s with %s\n", + indent, __DATE__, __TIME__, CC_IDENT); + av_log(NULL, level, "%sconfiguration: " FFMPEG_CONFIGURATION "\n", indent); } |