summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-11-11 13:47:42 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-11-11 13:47:42 +0000
commit4000629e2d2b652201f6f900cf6a70fa5da4d7c6 (patch)
tree20c5359f143caeb50e86963875c9f3c687660d60 /libmpdemux
parent68fb450f6e9f6b1a32341927df58f78550357aae (diff)
downloadmpv-4000629e2d2b652201f6f900cf6a70fa5da4d7c6.tar.bz2
mpv-4000629e2d2b652201f6f900cf6a70fa5da4d7c6.tar.xz
never include files from public headers...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2831 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/tv.c5
-rw-r--r--libmpdemux/tv.h9
-rw-r--r--libmpdemux/tvi_dummy.c1
-rw-r--r--libmpdemux/tvi_v4l.c5
4 files changed, 15 insertions, 5 deletions
diff --git a/libmpdemux/tv.c b/libmpdemux/tv.c
index db264f8ae3..7023fc8f29 100644
--- a/libmpdemux/tv.c
+++ b/libmpdemux/tv.c
@@ -21,6 +21,11 @@ int tv_param_on = 0;
#include "stream.h"
#include "demuxer.h"
#include "stheader.h"
+
+#include "../libao2/afmt.h"
+#include "../libvo/img_format.h"
+#include "../libvo/fastmemcpy.h"
+
#include "tv.h"
/* some default values */
diff --git a/libmpdemux/tv.h b/libmpdemux/tv.h
index a7a7a67160..fd3c9ae953 100644
--- a/libmpdemux/tv.h
+++ b/libmpdemux/tv.h
@@ -1,12 +1,11 @@
-#include "config.h"
extern int tv_param_on;
#ifdef USE_TV
-#include "../libao2/afmt.h"
-#include "../libvo/img_format.h"
-#include "../libvo/fastmemcpy.h"
-#include "mp_msg.h"
+//#include "../libao2/afmt.h"
+//#include "../libvo/img_format.h"
+//#include "../libvo/fastmemcpy.h"
+//#include "mp_msg.h"
extern unsigned long tv_param_freq;
extern char *tv_param_channel;
diff --git a/libmpdemux/tvi_dummy.c b/libmpdemux/tvi_dummy.c
index c176ec39b9..e3cefc3285 100644
--- a/libmpdemux/tvi_dummy.c
+++ b/libmpdemux/tvi_dummy.c
@@ -7,6 +7,7 @@
#ifdef USE_TV
#include <stdio.h>
+#include "../libvo/img_format.h"
#include "tv.h"
/* information about this file */
diff --git a/libmpdemux/tvi_v4l.c b/libmpdemux/tvi_v4l.c
index 0918f5076d..f88746c088 100644
--- a/libmpdemux/tvi_v4l.c
+++ b/libmpdemux/tvi_v4l.c
@@ -23,6 +23,11 @@
#include <unistd.h>
#include <sys/mman.h>
+#include "mp_msg.h"
+#include "../libao2/afmt.h"
+#include "../libvo/img_format.h"
+#include "../libvo/fastmemcpy.h"
+
#include "tv.h"
static tvi_info_t info = {