Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Conflicts:
	lib/libdvbsub/dvbsub.cpp
	lib/libtuxtxt/tuxtxt.cpp
	src/driver/lcdd.cpp
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 40c7218952
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit

lib/libdvbsub/dvbsub.cpp

@@ -15,6 +15,7 @@
 #include "PacketQueue.hpp"
 #include "helpers.hpp"
 #include "dvbsubtitle.h"
+#include <system/set_threadname.h>
 
 #define Log2File	printf
 #define RECVBUFFER_STEPSIZE 1024
@@ -244,6 +245,7 @@ static void* reader_thread(void * /*arg*/)
 	uint16_t packlen;
 	uint8_t* buf;
 	bool bad_startcode = false;
+	set_threadname("dvbsub:reader");
 
         dmx = new cDemux(0);
 #if HAVE_TRIPLEDRAGON
@@ -347,7 +349,7 @@ static void* dvbsub_thread(void* /*arg*/)
 {
 	struct timespec restartWait;
 	struct timeval now;
-
+	set_threadname("dvbsub:main");
 	sub_debug.print(Debug::VERBOSE, "%s started\n", __FUNCTION__);
 	if (!dvbSubtitleConverter)
 		dvbSubtitleConverter = new cDvbSubtitleConverter;