ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Mon Oct 23 18:20:07 2017 -0300| [572b7a0b8562fd42e51fda1006cdfd3c387fd649] | committer: James Almer
Merge commit '35cf146a33ce41a1adb6c9bd5a0827eacb1b6bfc' * commit '35cf146a33ce41a1adb6c9bd5a0827eacb1b6bfc': lavu: Drop deprecated av_dlog macro Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=572b7a0b8562fd42e51fda1006cdfd3c387fd649 --- libavutil/log.h | 14 -------------- libavutil/version.h | 3 --- 2 files changed, 17 deletions(-) diff --git a/libavutil/log.h b/libavutil/log.h index f0a57385df..d9554e609d 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 2aa89914be..ad22e67b03 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 ====================================================================== diff --cc libavutil/log.h index f0a57385df,ce00bccc7b..d9554e609d --- a/libavutil/log.h +++ b/libavutil/log.h @@@ -305,49 -248,7 +305,35 @@@ void av_log_default_callback(void *avcl * @return The AVClass class_name */ const char* av_default_item_name(void* ctx); +AVClassCategory av_default_get_category(void *ptr); + +/** + * Format a line of log the same way as the default callback. + * @param line buffer to receive the formatted line + * @param line_size size of the buffer + * @param print_prefix used to store whether the prefix must be printed; + * must point to a persistent integer initially set to 1 + */ +void av_log_format_line(void *ptr, int level, const char *fmt, va_list vl, + char *line, int line_size, int *print_prefix); + +/** + * Format a line of log the same way as the default callback. + * @param line buffer to receive the formatted line; + * may be NULL if line_size is 0 + * @param line_size size of the buffer; at most line_size-1 characters will + * be written to the buffer, plus one null terminator + * @param print_prefix used to store whether the prefix must be printed; + * must point to a persistent integer initially set to 1 + * @return Returns a negative value if an error occurred, otherwise returns + * the number of characters that would have been written for a + * sufficiently large buffer, not including the terminating null + * character. If the return value is not less than line_size, it means + * that the log message was truncated to fit the buffer. + */ +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 --cc libavutil/version.h index 2aa89914be,b8425ea2c8..ad22e67b03 --- a/libavutil/version.h +++ b/libavutil/version.h @@@ -106,14 -78,8 +106,11 @@@ * @{ */ - #ifndef FF_API_DLOG - #define FF_API_DLOG (LIBAVUTIL_VERSION_MAJOR < 56) - #endif -#ifndef FF_API_CRYPTO_CONTEXT -#define FF_API_CRYPTO_CONTEXT (LIBAVUTIL_VERSION_MAJOR < 57) +#ifndef FF_API_VAAPI +#define FF_API_VAAPI (LIBAVUTIL_VERSION_MAJOR < 57) +#endif +#ifndef FF_API_FRAME_QP +#define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 57) #endif #ifndef FF_API_PLUS1_MINUS1 #define FF_API_PLUS1_MINUS1 (LIBAVUTIL_VERSION_MAJOR < 57) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
