Merge branch 'master' into trunk

Makefile.in

@@ -115,9 +115,9 @@ OBJS	      = @OBJS@ \
 		ldgm-coding/matrix-gen/ldpc-matrix.o \
 		@LIB_SUPPORT_OBJ@ \
 
-HD_RUM_TRANSCODE_OBJS = src/hd-rum-decompress.o \
-		src/hd-rum-recompress.o \
-		src/hd-rum-translator.o
+HD_RUM_TRANSLATOR_OBJS = src/hd-rum-translator/hd-rum-decompress.o \
+		src/hd-rum-translator/hd-rum-recompress.o \
+		src/hd-rum-translator/hd-rum-translator.o
 
 LIB_COMMON = \
 		src/audio/utils.o \

src/hd-rum-translator/hd-rum-decompress.cpp

@@ -4,8 +4,8 @@
 #include "config_win32.h"
 #endif
 
-#include "hd-rum-decompress.h"
-#include "hd-rum-recompress.h"
+#include "hd-rum-translator/hd-rum-decompress.h"
+#include "hd-rum-translator/hd-rum-recompress.h"
 #include "rtp/ldgm.h"
 
 #include <map>

src/hd-rum-translator/hd-rum-recompress.cpp

@@ -4,7 +4,7 @@
 #include "config_win32.h"
 #endif
 
-#include "hd-rum-recompress.h"
+#include "hd-rum-translator/hd-rum-recompress.h"
 
 extern "C" {
 #include "debug.h"

src/hd-rum-translator/hd-rum-translator.c

@@ -22,8 +22,8 @@
 #include <pthread.h>
 #include <fcntl.h>
 
-#include "hd-rum-recompress.h"
-#include "hd-rum-decompress.h"
+#include "hd-rum-translator/hd-rum-recompress.h"
+#include "hd-rum-translator/hd-rum-decompress.h"
 
 #define EXIT_FAIL_USAGE 1
 #define EXIT_INIT_PORT 3

src/video_capture/swmix.cpp

@@ -572,7 +572,7 @@ vidcap_swmix_init(char *init_fmt, unsigned int flags)
 
         int token_nr = 0;
         tmp = parse_string = strdup(init_fmt);
-        if(strchr(parse_str, '#')) *strchr(parse_str, '#') = '\0';
+        if(strchr(parse_string, '#')) *strchr(parse_string, '#') = '\0';
         while((item = strtok_r(tmp, ":", &save_ptr))) {
                 bool found = false;
                 switch (token_nr) {