Unified the frame types.

1 files changed, 9 insertions, 8 deletions

diff --git a/src/decoder.h b/src/decoder.h
index 6d50e5b..0fd09d1 100644
--- a/src/decoder.h
+++ b/src/decoder.h
@@ -30,24 +30,25 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <avformat.h>
+//#include <avformat.h>
 #include <SDL/SDL.h>
 
-#include <queue.h>
+#include "queue.h"
 #include "encoder.h"
 #include "player.h"
 
 #include "thread.h"
-#include "ffframe.h"
-#include <dvframe.h>
+#include "frame.h"
+
+#define DVPACKAGE_SIZE 144000
 
 class Decoder : public Thread {
 public:
   Decoder(Error* err,
           sem_t *gencode_sem,
           sem_t *gplayer_sem,
-          Queue<DVFrame> *gencode_queue,
-          Queue<FFFrame> *gplayer_queue,
+          Queue<Frame> *gencode_queue,
+          Queue<Frame> *gplayer_queue,
           pthread_mutex_t *gmutex,
           volatile int *grunning);
   ~Decoder();
@@ -59,8 +60,8 @@ private:
 
   sem_t *encode_sem;
   sem_t *player_sem;
-  Queue<DVFrame> *encode_queue;
-  Queue<FFFrame> *player_queue;
+  Queue<Frame> *encode_queue;
+  Queue<Frame> *player_queue;
   pthread_mutex_t *mutex;
   volatile int *running;