From 07b3dbbbb2c6545791a8ca6d0123c824b146e4ce Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 21 Jan 2020 15:32:24 +0100 Subject: [PATCH] avutil/log: Move log_level_offset_offset code from av_log() to v_log() Suggested-by: Anton Signed-off-by: Michael Niedermayer --- libavutil/log.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavutil/log.c b/libavutil/log.c index e8a0db7716..c3e65f0470 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -362,19 +362,19 @@ static void (*av_log_callback)(void*, int, const char*, va_list) = void av_log(void* avcl, int level, const char *fmt, ...) { - AVClass* avc = avcl ? *(AVClass **) avcl : NULL; va_list vl; va_start(vl, fmt); - if (avc && avc->version >= (50 << 16 | 15 << 8 | 2) && - avc->log_level_offset_offset && level >= AV_LOG_FATAL) - level += *(int *) (((uint8_t *) avcl) + avc->log_level_offset_offset); av_vlog(avcl, level, fmt, vl); va_end(vl); } void av_vlog(void* avcl, int level, const char *fmt, va_list vl) { + AVClass* avc = avcl ? *(AVClass **) avcl : NULL; void (*log_callback)(void*, int, const char*, va_list) = av_log_callback; + if (avc && avc->version >= (50 << 16 | 15 << 8 | 2) && + avc->log_level_offset_offset && level >= AV_LOG_FATAL) + level += *(int *) (((uint8_t *) avcl) + avc->log_level_offset_offset); if (log_callback) log_callback(avcl, level, fmt, vl); }