RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

common/av_log: do not assume AVClass.item_name is always set 

After recent change in FFmpeg it is not longer safe to call item_name.

Ref: 0c6203c97a
This commit is contained in:
Kacper Michajłow 2023-12-23 22:42:26 +01:00 committed by sfan5
parent 0d47e48437
commit a44f0e574d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/av_log.c
View File

@ -108,6 +108,11 @@ static struct mp_log *get_av_log(void *ptr)
return log_root;
}
static const char *avclass_item_name(void *obj, const AVClass *avc)
{
return (avc->item_name ? avc->item_name : av_default_item_name)(obj);
}
static void mp_msg_av_log_callback(void *ptr, int level, const char *fmt,
va_list vl)
{
@ -131,7 +136,7 @@ static void mp_msg_av_log_callback(void *ptr, int level, const char *fmt,
bstr_xappend_vasprintf(log_root, &log_buffer, fmt, vl);
if (!log_buffer.len)
goto done;
const char *prefix = avc ? avc->item_name(ptr) : NULL;
const char *prefix = avc ? avclass_item_name(ptr, avc) : NULL;
if (log_print_prefix && prefix) {
mp_msg(log, mp_level, "%s: %.*s", prefix, BSTR_P(log_buffer));
} else {