mirror of https://git.ffmpeg.org/ffmpeg.git
avutil/log: Move log_level_offset_offset code from av_log() to v_log()
Suggested-by: Anton Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
7b7f97532b
commit
07b3dbbbb2
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue