From 4e13a6509ceb2ef84bb1f36ce41a09bdeaba3e68 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 29 Aug 2017 08:51:36 +0200
Subject: [PATCH] libav: log - remove trailing newline

---
 src/libav.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/libav.c b/src/libav.c
index dab9a658c..27dca2710 100644
--- a/src/libav.c
+++ b/src/libav.c
@@ -7,10 +7,19 @@
 static void
 libav_log_callback(void *ptr, int level, const char *fmt, va_list vl)
 {
-  int severity = LOG_TVH_NOTIFY;
+  int severity = LOG_TVH_NOTIFY, l;
+  char *fmt1 = (char *)fmt;
 
   if (level != AV_LOG_QUIET &&
       ((level <= AV_LOG_INFO) || (tvhlog_options & TVHLOG_OPT_LIBAV))) {
+
+    /* remove trailing newline */
+    l = strlen(fmt);
+    if (fmt[l-1] == '\n') {
+      fmt1 = tvh_strdupa(fmt);
+      fmt1[l-1] = '\0';
+    }
+
     switch(level) {
     case AV_LOG_TRACE:
 #if ENABLE_TRACE
@@ -41,7 +50,7 @@ libav_log_callback(void *ptr, int level, const char *fmt, va_list vl)
     }
     va_list ap;
     va_copy(ap, vl);
-    tvhlogv(__FILE__, __LINE__, severity, LS_LIBAV, fmt, &ap);
+    tvhlogv(__FILE__, __LINE__, severity, LS_LIBAV, fmt1, &ap);
     va_end(ap);
   }
 }
-- 
2.47.3