Merge commit '35cf146a33ce41a1adb6c9bd5a0827eacb1b6bfc'
* commit '35cf146a33ce41a1adb6c9bd5a0827eacb1b6bfc': lavu: Drop deprecated av_dlog macro Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
572b7a0b85
@ -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,
|
int av_log_format_line2(void *ptr, int level, const char *fmt, va_list vl,
|
||||||
char *line, int line_size, int *print_prefix);
|
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
|
* 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
|
* (f)printf as the 2 would otherwise interfere and lead to
|
||||||
|
@ -106,9 +106,6 @@
|
|||||||
* @{
|
* @{
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef FF_API_DLOG
|
|
||||||
#define FF_API_DLOG (LIBAVUTIL_VERSION_MAJOR < 56)
|
|
||||||
#endif
|
|
||||||
#ifndef FF_API_VAAPI
|
#ifndef FF_API_VAAPI
|
||||||
#define FF_API_VAAPI (LIBAVUTIL_VERSION_MAJOR < 57)
|
#define FF_API_VAAPI (LIBAVUTIL_VERSION_MAJOR < 57)
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user