refactoring

src/common/frame.h

@@ -29,8 +29,8 @@
 #include <string.h>
 #include <assert.h>
 
-#include "../common/tools.h"
-#include "../common/logging.h"
+#include "tools.h"
+#include "logging.h"
 
 
 typedef struct {

src/ustreamer/blank.h

@@ -30,7 +30,7 @@
 
 #include "../common/tools.h"
 #include "../common/logging.h"
-#include "frame.h"
+#include "../common/frame.h"
 
 #include "data/blank_jpeg.h"
 

src/ustreamer/encoder.h

@@ -33,9 +33,9 @@
 #include "../common/tools.h"
 #include "../common/threading.h"
 #include "../common/logging.h"
+#include "../common/frame.h"
 
 #include "device.h"
-#include "frame.h"
 
 #include "encoders/cpu/encoder.h"
 #include "encoders/hw/encoder.h"

src/ustreamer/encoders/cpu/encoder.h

@@ -32,7 +32,7 @@
 #include <linux/videodev2.h>
 
 #include "../../../common/tools.h"
-#include "../../frame.h"
+#include "../../../common/frame.h"
 #include "../../device.h"
 
 

src/ustreamer/encoders/hw/encoder.h

@@ -31,8 +31,8 @@
 
 #include "../../../common/tools.h"
 #include "../../../common/logging.h"
+#include "../../../common/frame.h"
 #include "../../xioctl.h"
-#include "../../frame.h"
 #include "../../device.h"
 
 #include "huffman.h"

src/ustreamer/encoders/omx/encoder.h

@@ -36,10 +36,10 @@
 #include <IL/OMX_Broadcom.h>
 #include <interface/vcos/vcos_semaphore.h>
 
-#include "../../../common/logging.h"
 #include "../../../common/tools.h"
+#include "../../../common/logging.h"
+#include "../../../common/frame.h"
 #include "../../device.h"
-#include "../../frame.h"
 
 #include "formatters.h"
 #include "component.h"

src/ustreamer/http/server.h

@@ -57,8 +57,8 @@
 #include "../../common/threading.h"
 #include "../../common/logging.h"
 #include "../../common/process.h"
+#include "../../common/frame.h"
 #include "../data/index_html.h"
-#include "../frame.h"
 #include "../encoder.h"
 #include "../stream.h"
 #ifdef WITH_GPIO

src/ustreamer/options.h

@@ -36,12 +36,12 @@
 #include "../common/config.h"
 #include "../common/logging.h"
 #include "../common/process.h"
+#include "../common/frame.h"
 #ifdef WITH_RAWSINK
 #	include "../rawsink/rawsink.h"
 #endif
 
 #include "device.h"
-#include "frame.h"
 #include "encoder.h"
 #include "blank.h"
 #include "stream.h"

src/ustreamer/stream.h

@@ -35,10 +35,9 @@
 #include "../common/tools.h"
 #include "../common/threading.h"
 #include "../common/logging.h"
+#include "../common/frame.h"
 
 #include "blank.h"
-
-#include "frame.h"
 #include "device.h"
 #include "encoder.h"
 #ifdef WITH_RAWSINK