From 7ebedcdb9456a6c08d4012b49d4029fdd040f3c4 Mon Sep 17 00:00:00 2001
From: Martin Pulec <pulec@cesnet.cz>
Date: Fri, 19 Apr 2013 11:03:19 +0200
Subject: [PATCH] some fixes

---
 src/hd-rum-translator/hd-rum-recompress.cpp | 2 --
 src/utils/worker.cpp                        | 5 +++--
 src/video_compress.c                        | 3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/hd-rum-translator/hd-rum-recompress.cpp b/src/hd-rum-translator/hd-rum-recompress.cpp
index 4b611c60a..cfa3078b7 100644
--- a/src/hd-rum-translator/hd-rum-recompress.cpp
+++ b/src/hd-rum-translator/hd-rum-recompress.cpp
@@ -19,8 +19,6 @@ extern "C" {
 #include "video_compress.h"
 #include "video_decompress.h"
 
-using namespace std;
-
 extern int mtu; // defined in hd-rum-transcode.c
 
 struct state_recompress {
diff --git a/src/utils/worker.cpp b/src/utils/worker.cpp
index 4d300e935..b43cdeb76 100644
--- a/src/utils/worker.cpp
+++ b/src/utils/worker.cpp
@@ -208,7 +208,8 @@ task_result_handle_t worker_pool::run_async(task_t task, void *data)
         set<worker*>::iterator it = m_empty_workers.begin();
         assert(it != m_empty_workers.end());
         w = *it;
-        m_empty_workers.erase(it);
+        /// @todo: really weird - it seems like that 'it' instead of 'w' caused some problems
+        m_empty_workers.erase(w);
         m_occupied_workers.insert(w);
         pthread_mutex_unlock(&m_lock);
 
@@ -227,7 +228,7 @@ class worker_pool instance;
 
 task_result_handle_t task_run_async(task_t task, void *data)
 {
-        instance.run_async(task, data);
+        return instance.run_async(task, data);
 }
 
 void *wait_task(task_result_handle_t handle)
diff --git a/src/video_compress.c b/src/video_compress.c
index 192b0b20d..cb836f54e 100644
--- a/src/video_compress.c
+++ b/src/video_compress.c
@@ -96,6 +96,7 @@ struct compress_state {
 static void init_compressions(void);
 static struct video_frame *compress_frame_tiles(struct compress_state *s, struct video_frame *frame,
                 int buffer_index);
+static void *compress_tile(void *arg);
 
 struct compress_t compress_modules[] = {
 #if defined HAVE_FASTDXT || defined BUILD_LIBRARIES
@@ -330,7 +331,7 @@ struct compress_data {
         void *ret;
 };
 
-void *compress_tile(void *arg) {
+static void *compress_tile(void *arg) {
         struct compress_data *s = (struct compress_data *) arg;
 
         s->ret = s->callback(s->state, s->tile, &s->desc, s->buffer_index);