diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 13:25:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 13:34:45 +0100 |
| commit | 99efd596267248ba5eae1b0e540d880368a402c3 (patch) | |
| tree | 1ab9b0250d1350ffaae7d5f2bf98ba78e21d0cf4 /libavutil/log.c | |
| parent | 1fa2bdc90a4a5309a3bf83ff9ae37f59e5f329fa (diff) | |
| parent | cb45553f577f8e0ebfe05d3287e1b6fa5859b967 (diff) | |
| download | ffmpeg-99efd596267248ba5eae1b0e540d880368a402c3.tar.gz | |
Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'
* commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967':
Remove pointless #undefs of previously forbidden functions.
fate: Add dependencies for bmp, cdxl, dfa, mp3
Conflicts:
doc/examples/muxing.c
libavfilter/filtfmts.c
libavutil/des.c
libavutil/eval.c
libavutil/log.c
libavutil/parseutils.c
tests/fate/mp3.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/log.c')
| -rw-r--r-- | libavutil/log.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavutil/log.c b/libavutil/log.c index 57b3d5d087..700e89fa97 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -99,7 +99,6 @@ static const uint32_t color[16 + AV_CLASS_CATEGORY_NB] = { #endif static int use_color = -1; -#undef fprintf static void colored_fputs(int level, const char *str) { if (use_color < 0) { @@ -220,7 +219,6 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl) is_atty = isatty(2) ? 1 : -1; #endif -#undef fprintf if (print_prefix && (flags & AV_LOG_SKIP_REPEATED) && !strcmp(line, prev)){ count++; if (is_atty == 1) |