diff options
author | wm4 <wm4@nowhere> | 2015-06-20 17:02:56 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-06-20 17:02:56 +0200 |
commit | 34fce974c60177444d23ab1b658545b32046785f (patch) | |
tree | 0f06377f4866213a58fb76f0627b13fd8da5b08c /common/av_log.c | |
parent | 4e1159c3f2a3f9fec971c5f4d9cc210b8566e0a3 (diff) | |
download | mpv-34fce974c60177444d23ab1b658545b32046785f.tar.bz2 mpv-34fce974c60177444d23ab1b658545b32046785f.tar.xz |
av_log: skip prefix if unknown
This happens with av_log(NULL, ...) calls. Drop the "?: " fallback
prefix, because it was confusing.
(Of course FFmpeg should not do this at all, but it's a very long way to
making the FFmpeg log callback sane.)
Diffstat (limited to 'common/av_log.c')
-rw-r--r-- | common/av_log.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/common/av_log.c b/common/av_log.c index 0dbda72866..5ae8f13263 100644 --- a/common/av_log.c +++ b/common/av_log.c @@ -134,8 +134,9 @@ static void mp_msg_av_log_callback(void *ptr, int level, const char *fmt, struct mp_log *log = get_av_log(ptr); if (mp_msg_test(log, mp_level)) { - if (log_print_prefix) - mp_msg(log, mp_level, "%s: ", avc ? avc->item_name(ptr) : "?"); + const char *prefix = avc ? avc->item_name(ptr) : NULL; + if (log_print_prefix && prefix) + mp_msg(log, mp_level, "%s: ", prefix); log_print_prefix = fmt[strlen(fmt) - 1] == '\n'; mp_msg_va(log, mp_level, fmt, vl); |