1 files changed, 21 insertions, 12 deletions

diff --git a/common/av_log.c b/common/av_log.c
index b6bad04..54b78a6 100644
--- a/common/av_log.c
+++ b/common/av_log.c
@@ -28,6 +28,7 @@
 #include "common/global.h"
 #include "common/msg.h"
 #include "config.h"
+#include "misc/bstr.h"
 #include "osdep/threads.h"
 
 #include <libavutil/avutil.h>
@@ -55,6 +56,7 @@ static mp_static_mutex log_lock = MP_STATIC_MUTEX_INITIALIZER;
 static struct mpv_global *log_mpv_instance;
 static struct mp_log *log_root, *log_decaudio, *log_decvideo, *log_demuxer;
 static bool log_print_prefix = true;
+static bstr log_buffer;
 
 static int av_log_level_to_mp_level(int av_level)
 {
@@ -80,7 +82,7 @@ static struct mp_log *get_av_log(void *ptr)
     if (!avc) {
         mp_warn(log_root,
                "av_log callback called with bad parameters (NULL AVClass).\n"
-               "This is a bug in one of Libav/FFmpeg libraries used.\n");
+               "This is a bug in one of FFmpeg libraries used.\n");
         return log_root;
     }
 
@@ -106,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)
 {
@@ -125,19 +132,20 @@ 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)) {
-        char buffer[4096] = "";
-        int pos = 0;
-        const char *prefix = avc ? avc->item_name(ptr) : NULL;
-        if (log_print_prefix && prefix)
-            pos = snprintf(buffer, sizeof(buffer), "%s: ", prefix);
-        log_print_prefix = fmt[strlen(fmt) - 1] == '\n';
-
-        pos = MPMIN(MPMAX(pos, 0), sizeof(buffer));
-        vsnprintf(buffer + pos, sizeof(buffer) - pos, fmt, vl);
-
-        mp_msg(log, mp_level, "%s", buffer);
+        log_buffer.len = 0;
+        bstr_xappend_vasprintf(log_root, &log_buffer, fmt, vl);
+        if (!log_buffer.len)
+            goto done;
+        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 {
+            mp_msg(log, mp_level, "%.*s", BSTR_P(log_buffer));
+        }
+        log_print_prefix = log_buffer.start[log_buffer.len - 1] == '\n';
     }
 
+done:
     mp_mutex_unlock(&log_lock);
 }
 
@@ -150,6 +158,7 @@ void init_libav(struct mpv_global *global)
         log_decaudio = mp_log_new(log_root, log_root, "audio");
         log_decvideo = mp_log_new(log_root, log_root, "video");
         log_demuxer = mp_log_new(log_root, log_root, "demuxer");
+        log_buffer = (bstr){0};
         av_log_set_callback(mp_msg_av_log_callback);
     }
     mp_mutex_unlock(&log_lock);