Unified the frame types.

1 files changed, 7 insertions, 10 deletions

diff --git a/src/encoder.h b/src/encoder.h
index 75788b4..d9534b3 100644
--- a/src/encoder.h
+++ b/src/encoder.h
@@ -30,17 +30,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <avformat.h>
-
-#include <miav.h>
+//#include <avformat.h>
 
+#include "miav.h"
 #include "util.h"
-#include <queue.h>
-
 #include "package.h"
-
 #include "thread.h"
-#include <dvframe.h>
+#include "frame.h"
+#include "queue.h"
 
 // FIXME: One size fits all...
 #define VIDEO_BUFFER_SIZE	(1024*1024)
@@ -56,7 +53,7 @@ public:
           const char *gip,
           const int gport,
           sem_t	*gsem,
-          Queue<DVFrame> *gqueue,
+          Queue<Frame> *gqueue,
           pthread_mutex_t *gmutex,
           volatile int *grunning);
   ~Encoder();
@@ -71,9 +68,9 @@ public:
 
   void run();
 
-  AVFormatContext *fc;
+  //  AVFormatContext *fc;
   sem_t	*sem;
-  Queue<DVFrame> *queue;
+  Queue<Frame> *queue;
   pthread_mutex_t *mutex;
   volatile int *running;