Unified the frame types.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/player.h b/src/player.h
index 2af4165..ca2d241 100644
--- a/src/player.h
+++ b/src/player.h
@@ -34,13 +34,13 @@
 #include <pthread.h>
 #include <time.h>
 #include <SDL/SDL.h>
-#include <avformat.h>
+//#include <avformat.h>
 
 #include "util.h"
-#include <queue.h>
+#include "queue.h"
 
 #include "thread.h"
-#include "ffframe.h"
+#include "frame.h"
 
 #include <qwidget.h>
 
@@ -56,7 +56,7 @@ public:
   Player(Error* err,
          volatile int *grunning,
          sem_t	*gsem,
-         Queue<FFFrame> *gqueue,
+         Queue<Frame> *gqueue,
          pthread_mutex_t *gmutex);
   ~Player();
 
@@ -75,7 +75,7 @@ private:
 
   volatile int *running;
   sem_t	*sem;
-  Queue<FFFrame> *queue;
+  Queue<Frame> *queue;
   pthread_mutex_t *mutex;
 
   sem_t	play_sem;