diff options
author | James Almer <jamrial@gmail.com> | 2017-10-23 18:20:07 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-10-23 18:20:07 -0300 |
commit | 572b7a0b8562fd42e51fda1006cdfd3c387fd649 (patch) | |
tree | 440df6deb635f2382379107a8d6175bac0bf525f /libavutil | |
parent | c0cfc0ce11c14285299838d2c1e96159bf9cb9de (diff) | |
parent | 35cf146a33ce41a1adb6c9bd5a0827eacb1b6bfc (diff) | |
download | ffmpeg-streaming-572b7a0b8562fd42e51fda1006cdfd3c387fd649.zip ffmpeg-streaming-572b7a0b8562fd42e51fda1006cdfd3c387fd649.tar.gz |
Merge commit '35cf146a33ce41a1adb6c9bd5a0827eacb1b6bfc'
* commit '35cf146a33ce41a1adb6c9bd5a0827eacb1b6bfc':
lavu: Drop deprecated av_dlog macro
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil')
-rw-r--r-- | libavutil/log.h | 14 | ||||
-rw-r--r-- | libavutil/version.h | 3 |
2 files changed, 0 insertions, 17 deletions
diff --git a/libavutil/log.h b/libavutil/log.h index f0a5738..d9554e6 100644 --- a/libavutil/log.h +++ b/libavutil/log.h @@ -334,20 +334,6 @@ void av_log_format_line(void *ptr, int level, const char *fmt, va_list vl, int av_log_format_line2(void *ptr, int level, const char *fmt, va_list vl, char *line, int line_size, int *print_prefix); -#if FF_API_DLOG -/** - * av_dlog macros - * @deprecated unused - * Useful to print debug messages that shouldn't get compiled in normally. - */ - -#ifdef DEBUG -# define av_dlog(pctx, ...) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__) -#else -# define av_dlog(pctx, ...) do { if (0) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__); } while (0) -#endif -#endif /* FF_API_DLOG */ - /** * Skip repeated messages, this requires the user app to use av_log() instead of * (f)printf as the 2 would otherwise interfere and lead to diff --git a/libavutil/version.h b/libavutil/version.h index 2aa8991..ad22e67 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -106,9 +106,6 @@ * @{ */ -#ifndef FF_API_DLOG -#define FF_API_DLOG (LIBAVUTIL_VERSION_MAJOR < 56) -#endif #ifndef FF_API_VAAPI #define FF_API_VAAPI (LIBAVUTIL_VERSION_MAJOR < 57) #endif |