summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordeva <deva>2006-03-04 15:24:54 +0000
committerdeva <deva>2006-03-04 15:24:54 +0000
commitdc1ee96e73016e570fa948e8d9efa946917eb452 (patch)
tree24e1d8cf97920fd6305e8582deb51630ecf547bb
parentf02095ee5ceb78f1781a9e250693b8866ca42181 (diff)
*** empty log message ***
-rw-r--r--client/dvfile.cc (renamed from server/dvfile.cc)0
-rw-r--r--client/dvfile.h (renamed from server/dvfile.h)0
-rw-r--r--lib/dv.h (renamed from client/dv.h)0
-rw-r--r--lib/frame.cc2
-rw-r--r--server/img_encoder.cc2
-rw-r--r--server/miav_server.cc4
-rw-r--r--server/mov_encoder.cc1
-rw-r--r--server/server.cc2
8 files changed, 3 insertions, 8 deletions
diff --git a/server/dvfile.cc b/client/dvfile.cc
index 7d83255..7d83255 100644
--- a/server/dvfile.cc
+++ b/client/dvfile.cc
diff --git a/server/dvfile.h b/client/dvfile.h
index dc91a14..dc91a14 100644
--- a/server/dvfile.h
+++ b/client/dvfile.h
diff --git a/client/dv.h b/lib/dv.h
index e346d03..e346d03 100644
--- a/client/dv.h
+++ b/lib/dv.h
diff --git a/lib/frame.cc b/lib/frame.cc
index a274d89..568c46b 100644
--- a/lib/frame.cc
+++ b/lib/frame.cc
@@ -27,8 +27,6 @@
#include <config.h>
#include "frame.h"
-#include "debug.h"
-
#include <memory.h>
#include <stdlib.h>
diff --git a/server/img_encoder.cc b/server/img_encoder.cc
index 9282dc0..bb36009 100644
--- a/server/img_encoder.cc
+++ b/server/img_encoder.cc
@@ -35,8 +35,6 @@
#include "img_encoder.h"
#include <stdio.h>
-#include "debug.h"
-
extern "C" {
#include <jpeglib.h>
}
diff --git a/server/miav_server.cc b/server/miav_server.cc
index 88a0d2a..5b5a29d 100644
--- a/server/miav_server.cc
+++ b/server/miav_server.cc
@@ -1,9 +1,9 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/***************************************************************************
- * miav.cc
+ * miav_server.cc
*
* Sat Aug 21 17:32:24 2004
- * Copyright 2004 deva
+ * Copyright 2004 Bent Bisballe Nyeng
* deva@aasimon.org
****************************************************************************/
diff --git a/server/mov_encoder.cc b/server/mov_encoder.cc
index 6ac5876..0c97e18 100644
--- a/server/mov_encoder.cc
+++ b/server/mov_encoder.cc
@@ -41,7 +41,6 @@
#include "miav_config.h"
-#include "debug.h"
#include "libfame_wrapper.h"
MovEncoder::MovEncoder(volatile bool *r, sem_t *r_sem,
diff --git a/server/server.cc b/server/server.cc
index 34aac7b..e306cf1 100644
--- a/server/server.cc
+++ b/server/server.cc
@@ -25,7 +25,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
#include "server.h"
-#include "miav.h"
+#include "miav_server.h"
#include <stdio.h>
#include <stdlib.h>