From 34fce974c60177444d23ab1b658545b32046785f Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 20 Jun 2015 17:02:56 +0200
Subject: 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.)
---
 common/av_log.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'common')

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);
-- 
cgit v1.2.3