From 70a19c482a62bbbcda5a1115cfcd6a708f598fbc Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Mon, 17 Aug 2015 20:27:25 -0400 Subject: [PATCH] Move ff_dlog from lavc to lavu. --- libavcodec/internal.h | 6 ------ libavutil/internal.h | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 0daf6695e6..f93a196483 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -48,12 +48,6 @@ #define FF_CODEC_CAP_INIT_CLEANUP (1 << 1) -#ifdef DEBUG -# define ff_dlog(ctx, ...) av_log(ctx, AV_LOG_DEBUG, __VA_ARGS__) -#else -# define ff_dlog(ctx, ...) do { if (0) av_log(ctx, AV_LOG_DEBUG, __VA_ARGS__); } while (0) -#endif - #ifdef TRACE # define ff_tlog(ctx, ...) av_log(ctx, AV_LOG_TRACE, __VA_ARGS__) #else diff --git a/libavutil/internal.h b/libavutil/internal.h index a46b2b15ce..047f742e5a 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -250,6 +250,12 @@ void avpriv_request_sample(void *avc, #define SIZE_SPECIFIER "zu" #endif +#ifdef DEBUG +# define ff_dlog(ctx, ...) av_log(ctx, AV_LOG_DEBUG, __VA_ARGS__) +#else +# define ff_dlog(ctx, ...) do { if (0) av_log(ctx, AV_LOG_DEBUG, __VA_ARGS__); } while (0) +#endif + /** * A wrapper for open() setting O_CLOEXEC. */