From 549502868d7192cefbc59708b1bdb9bd6b5d60c6 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Mon, 2 Aug 2021 00:27:41 +0200 Subject: [PATCH] Move ff_tlog() from lavc/internal.h to lavu/internal.h It is also used by libavfilter and it is only natural to define it alongside ff_dlog(). Signed-off-by: Andreas Rheinhardt --- libavcodec/internal.h | 7 ------- libavutil/internal.h | 6 ++++++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 1921515bdd..dc60e4bf08 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -91,13 +91,6 @@ #define FF_CODEC_TAGS_END -1 -#ifdef TRACE -# define ff_tlog(ctx, ...) av_log(ctx, AV_LOG_TRACE, __VA_ARGS__) -#else -# define ff_tlog(ctx, ...) do { } while(0) -#endif - - #define FF_DEFAULT_QUANT_BIAS 999999 #define FF_QSCALE_TYPE_MPEG1 0 diff --git a/libavutil/internal.h b/libavutil/internal.h index a33e8700c3..d8a1f2672e 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -198,6 +198,12 @@ void avpriv_request_sample(void *avc, # 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 +# define ff_tlog(ctx, ...) do { } while(0) +#endif + // For debuging we use signed operations so overflows can be detected (by ubsan) // For production we use unsigned so there are no undefined operations #ifdef CHECKED