Ticket #2460: libavcodec-log-2.patch

libs/libmyth/mythcontext.cpp

@@ -153 +153 @@
     return QString("%1 (%2)").arg(strerror(errnum)).arg(errnum);
 }
 
+extern "C"
+{
+#include "../libavutil/avutil.h"
+}
+
+void myth_av_log(void *ptr, int level, const char* fmt, va_list vl)
+{
+    static QString full_line("");
+
+    if (level >= AV_LOG_DEBUG)
+        return;
+
+    if ((print_verbose_messages & VB_LIBAV) != VB_LIBAV)
+        return;
+
+    if (full_line.isEmpty() && ptr) {
+        AVClass* avc = *(AVClass**)ptr;
+        full_line.sprintf("[%s @ %p]", avc->item_name(ptr), avc);
+    }
+
+    char str[256];
+    vsprintf(str, fmt, vl);
+
+    full_line += QString(str);
+    if (full_line.endsWith("\n"))
+    {
+        full_line.truncate(full_line.length() - 1);
+        VERBOSE(VB_LIBAV, full_line);
+        full_line.truncate(0);
+    }
+}
+
 
 class MythContextPrivate
 {
@@ -442 +474 @@
         StoreGUIsettings();
     }
 
+    av_log_set_callback(myth_av_log);
+
     return true;
 }
 

programs/mythuitest/mythuitest.pro

@@ -1 +1 @@
 INCLUDEPATH += ../../libs/libmythui ../../libs/libmyth
 
 LIBS += -L../../libs/libmyth -L../../libs/libmythui
+LIBS += -L../../libs/libavutil
 
 include ( ../../config.mak )
 include ( ../../settings.pro )
@@ -10 +11 @@
 CONFIG += thread opengl
 
 LIBS += -lmythui-$$LIBVERSION -lmyth-$$LIBVERSION $$EXTRA_LIBS
+LIBS += -lmythavutil-$$LIBVERSION
 
 isEmpty(QMAKE_EXTENSION_SHLIB) {
   QMAKE_EXTENSION_SHLIB=so