Fix merge conflicts

Origin commit data
------------------
Commit: 8272eda529
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)

src/driver/streamts.cpp

@@ -56,7 +56,10 @@
 #include <driver/streamts.h>
 #include <driver/record.h>
 #include <driver/genpsi.h>
-//#include <system/set_threadname.h>
+/* merge conflict */
+#if 0
+#include <system/set_threadname.h>
+#endif
 #include <gui/movieplayer.h>
 #include <cs_api.h>
 
@@ -165,6 +168,7 @@ void CStreamInstance::RemoveClient(int clientfd)
 
 bool CStreamInstance::Open()
 {
+/* merge conflict */
 #if 0
 	printf("CStreamInstance::run: %" PRIx64 "\n", channel_id);
 	set_threadname("n:streaminstance");
@@ -558,7 +562,10 @@ void CStreamManager::run()
 	int poll_timeout = -1;
 
 	printf("Starting STREAM thread keeper, tid %ld\n", syscall(__NR_gettid));
+/* merge conflict */
+#if 0
 	set_threadname("n:streammanager");
+#endif
 
 	while (running) {
 		mutex.lock();