RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-22 23:33:07 +00:00
Code Issues Projects Releases Wiki Activity

lavu/log: do not assume AVClass.item_name is always set

Browse Source
This commit is contained in:
Anton Khirnov 2023-11-04 08:04:11 +01:00
parent 26ebd96371
commit acf63d5350
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavutil/log.c
View File

@ -291,6 +291,11 @@ static const char *get_level_str(int level)
} }
} }
static const char *item_name(void *obj, const AVClass *cls)
{
return (cls->item_name ? cls->item_name : av_default_item_name)(obj);
}
static void format_line(void *avcl, int level, const char *fmt, va_list vl, static void format_line(void *avcl, int level, const char *fmt, va_list vl,
AVBPrint part[4], int *print_prefix, int type[2]) AVBPrint part[4], int *print_prefix, int type[2])
{ {
@ -307,12 +312,12 @@ static void format_line(void *avcl, int level, const char *fmt, va_list vl,
avc->parent_log_context_offset); avc->parent_log_context_offset);
if (parent && *parent) { if (parent && *parent) {
av_bprintf(part+0, "[%s @ %p] ", av_bprintf(part+0, "[%s @ %p] ",
(*parent)->item_name(parent), parent); item_name(parent, *parent), parent);
if(type) type[0] = get_category(parent); if(type) type[0] = get_category(parent);
} }
} }
av_bprintf(part+1, "[%s @ %p] ", av_bprintf(part+1, "[%s @ %p] ",
avc->item_name(avcl), avcl); item_name(avcl, avc), avcl);
if(type) type[1] = get_category(avcl); if(type) type[1] = get_category(avcl);
} }