cleaned out ffmpeg from the client

5 files changed, 38 insertions, 4 deletions

diff --git a/src/camera.h b/src/camera.h
index ab18d04..8760b61 100644
--- a/src/camera.h
+++ b/src/camera.h
@@ -39,15 +39,14 @@ using namespace std;
 #include <avformat.h>
 
 #include "util.h"
-#include <queue.h>
+#include "queue.h"
 #include "decoder.h"
 #include "encoder.h"
 #include "player.h"
 #include "package.h"
 
 #include "thread.h"
-#include "ffframe.h"
-#include <dvframe.h>
+#include "frame.h"
 
 #include <qwidget.h>
 
diff --git a/src/decoder.cc b/src/decoder.cc
index 9633f18..4bdf2cf 100644
--- a/src/decoder.cc
+++ b/src/decoder.cc
@@ -28,6 +28,8 @@
 #include <errno.h>
 #include <libraw1394/raw1394.h>
 
+#include "dv.h"
+
 #include "decoder.h"
 #include "debug.h"
 
diff --git a/src/decoder.h b/src/decoder.h
index 0fd09d1..649fda8 100644
--- a/src/decoder.h
+++ b/src/decoder.h
@@ -40,7 +40,6 @@
 #include "thread.h"
 #include "frame.h"
 
-#define DVPACKAGE_SIZE 144000
 
 class Decoder : public Thread {
 public:
diff --git a/src/dv.h b/src/dv.h
new file mode 100644
index 0000000..279a278
--- /dev/null
+++ b/src/dv.h
@@ -0,0 +1,32 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/***************************************************************************
+ *            dv.h
+ *
+ *  Thu Apr 14 19:29:55 CEST 2005
+ *  Copyright  2005 Bent Bisballe
+ *  deva@aasimon.org
+ ****************************************************************************/
+
+/*
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <config.h>
+#ifndef __MIAV_DV_H__
+#define __MIAV_DV_H__
+
+#define DVPACKAGE_SIZE 144000
+
+#endif/*__MIAV_DV_H__*/
diff --git a/src/server.cc b/src/server.cc
index b659fb5..e94b576 100644
--- a/src/server.cc
+++ b/src/server.cc
@@ -32,6 +32,8 @@
 #include "mov_encoder.h"
 #include "img_encoder.h"
 
+#include "dv.h"
+
 void saveFrameAsImage(char* cpr, Frame *f)
 {
   char fname[256];