From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 2 Jun 2015 18:23:24 +0000 (+0200)
Subject: libav: fix the previous change (debug libav option)
X-Git-Tag: v4.2.1~2381
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca84c71a8a3127aa7d74bd6c9ee55794ce60bba6;p=thirdparty%2Ftvheadend.git

libav: fix the previous change (debug libav option)
---

diff --git a/src/libav.c b/src/libav.c
index 916de4ffd..a2cfa37ab 100644
--- a/src/libav.c
+++ b/src/libav.c
@@ -10,6 +10,9 @@ libav_log_callback(void *ptr, int level, const char *fmt, va_list vl)
     char *nl;
     char *l;
 
+    if ((level == AV_LOG_DEBUG) && !(tvhlog_options & TVHLOG_OPT_LIBAV))
+      return;
+
     memset(message, 0, sizeof(message));
     vsnprintf(message, sizeof(message), fmt, vl);
 
diff --git a/src/webui/static/app/tvhlog.js b/src/webui/static/app/tvhlog.js
index 3a9c45b05..aee247313 100644
--- a/src/webui/static/app/tvhlog.js
+++ b/src/webui/static/app/tvhlog.js
@@ -5,7 +5,7 @@ tvheadend.tvhlog = function(panel, index) {
     var confreader = new Ext.data.JsonReader({
         root: 'config'
     }, ['tvhlog_path', 'tvhlog_dbg_syslog', 'tvhlog_trace_on',
-        'tvhlog_debug', 'tvhlog_trace']);
+        'tvhlog_debug', 'tvhlog_trace', 'tvhlog_libav']);
 
     /* ****************************************************************
      * Form Fields