[MPlayer-cvslog] CVS: main/libmpdemux cache2.c, 1.30, 1.31 cdda.c, 1.20, 1.21 cddb.c, 1.20, 1.21 cue_read.c, 1.11, 1.12 demux_asf.c, 1.35, 1.36 demux_audio.c, 1.41, 1.42 demux_mkv.c, 1.52, 1.53 demux_mov.c, 1.133, 1.134 demux_ogg.c, 1.83, 1.84 demux_rawaudio.c, 1.14, 1.15 demux_rawvideo.c, 1.9, 1.10 demux_ts.c, 1.39, 1.40 demux_ty.c, 1.10, 1.11 demux_ty_osd.c, 1.4, 1.5 demux_vqf.c, 1.5, 1.6 demux_xmms.c, 1.13, 1.14 demuxer.c, 1.209, 1.210 dvb_tune.c, 1.12, 1.13 dvbin.c, 1.15, 1.16 dvdnav_stream.c, 1.4, 1.5 mf.c, 1.9, 1.10 mp3_hdr.c, 1.12, 1.13 muxer.c, 1.9, 1.10 muxer_avi.c, 1.30, 1.31 muxer_lavf.c, 1.11, 1.12 muxer_mpeg.c, 1.21, 1.22 muxer_rawvideo.c, 1.4, 1.5 network.c, 1.118, 1.119 open.c, 1.109, 1.110 stream.c, 1.82, 1.83 stream.h, 1.72, 1.73 stream_dvd.c, 1.6, 1.7 stream_file.c, 1.10, 1.11 stream_ftp.c, 1.7, 1.8 stream_netstream.c, 1.7, 1.8 stream_smb.c, 1.2, 1.3 stream_vcd.c, 1.9, 1.10 stream_vstream.c, 1.1, 1.2 test.c, 1.11, 1.12 tv.c, 1.75, 1.76 tv.h, 1.30, 1.31 tvi_bsdbt848.c, 1.16, 1.17 tvi_dummy.c, 1.11, 1.12 tvi_v4l.c, 1.74, 1.75 tvi_v4l2.c, 1.33, 1.34 video.c, 1.54, 1.55

Diego Biurrun CVS syncmail at mplayerhq.hu
Fri Nov 18 15:39:58 CET 2005


CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv31333/libmpdemux

Modified Files:
	cache2.c cdda.c cddb.c cue_read.c demux_asf.c demux_audio.c 
	demux_mkv.c demux_mov.c demux_ogg.c demux_rawaudio.c 
	demux_rawvideo.c demux_ts.c demux_ty.c demux_ty_osd.c 
	demux_vqf.c demux_xmms.c demuxer.c dvb_tune.c dvbin.c 
	dvdnav_stream.c mf.c mp3_hdr.c muxer.c muxer_avi.c 
	muxer_lavf.c muxer_mpeg.c muxer_rawvideo.c network.c open.c 
	stream.c stream.h stream_dvd.c stream_file.c stream_ftp.c 
	stream_netstream.c stream_smb.c stream_vcd.c stream_vstream.c 
	test.c tv.c tv.h tvi_bsdbt848.c tvi_dummy.c tvi_v4l.c 
	tvi_v4l2.c video.c 
Log Message:
Unify include path handling, -I.. is in CFLAGS.


Index: cache2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/cache2.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- cache2.c	27 Oct 2005 06:55:05 -0000	1.30
+++ cache2.c	18 Nov 2005 14:39:18 -0000	1.31
@@ -17,10 +17,10 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "../osdep/timer.h"
+#include "osdep/timer.h"
 #ifndef WIN32
 #include <sys/wait.h>
-#include "../osdep/shmem.h"
+#include "osdep/shmem.h"
 #else
 #include <windows.h>
 static DWORD WINAPI ThreadProc(void* s);

Index: cdda.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/cdda.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- cdda.c	10 Nov 2005 21:33:12 -0000	1.20
+++ cdda.c	18 Nov 2005 14:39:18 -0000	1.21
@@ -3,9 +3,9 @@
 #ifdef HAVE_CDDA
 
 #include "stream.h"
-#include "../m_option.h"
-#include "../m_struct.h"
-#include "../bswap.h"
+#include "m_option.h"
+#include "m_struct.h"
+#include "bswap.h"
 
 #include <stdio.h>
 #include <stdlib.h>

Index: cddb.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/cddb.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- cddb.c	10 Nov 2005 21:33:12 -0000	1.20
+++ cddb.c	18 Nov 2005 14:39:18 -0000	1.21
@@ -48,7 +48,7 @@
 #endif
 
 #include "cdd.h"
-#include "../version.h"
+#include "version.h"
 #include "stream.h"
 #include "network.h"
 

Index: cue_read.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/cue_read.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cue_read.c	10 Nov 2005 21:33:12 -0000	1.11
+++ cue_read.c	18 Nov 2005 14:39:18 -0000	1.12
@@ -17,8 +17,8 @@
 
 #include "cue_read.h"
 #include "help_mp.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 #define byte    unsigned char
 #define SIZERAW 2352

Index: demux_asf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_asf.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- demux_asf.c	30 Oct 2005 09:19:05 -0000	1.35
+++ demux_asf.c	18 Nov 2005 14:39:18 -0000	1.36
@@ -12,7 +12,7 @@
 #include "asf.h"
 #include "demuxer.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 /*
  * Load 16/32-bit values in little endian byte order

Index: demux_audio.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_audio.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- demux_audio.c	30 Oct 2005 09:19:05 -0000	1.41
+++ demux_audio.c	18 Nov 2005 14:39:18 -0000	1.42
@@ -1,6 +1,6 @@
 
 #include "config.h"
-#include "../mp_msg.h"
+#include "mp_msg.h"
 
 #include <stdlib.h>
 #include <stdio.h>

Index: demux_mkv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- demux_mkv.c	5 Nov 2005 04:56:23 -0000	1.52
+++ demux_mkv.c	18 Nov 2005 14:39:18 -0000	1.53
@@ -20,8 +20,8 @@
 #include "matroska.h"
 #include "bswap.h"
 
-#include "../subreader.h"
-#include "../libvo/sub.h"
+#include "subreader.h"
+#include "libvo/sub.h"
 
 #ifdef USE_QTX_CODECS
 #include "qtx/qtxsdk/components.h"
@@ -34,7 +34,7 @@
 #ifdef USE_LIBLZO
 #include <lzo1x.h>
 #else
-#include "../libmpcodecs/native/minilzo.h"
+#include "libmpcodecs/native/minilzo.h"
 #endif
 
 #if !defined(MIN)

Index: demux_mov.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- demux_mov.c	5 Oct 2005 14:55:06 -0000	1.133
+++ demux_mov.c	18 Nov 2005 14:39:18 -0000	1.134
@@ -40,7 +40,7 @@
 #include <QuickTime/ImageCompression.h>
 #include <QuickTime/ImageCodec.h>
 #else
-#include "../loader/qtx/qtxsdk/components.h"
+#include "loader/qtx/qtxsdk/components.h"
 #endif
 
 #ifdef HAVE_ZLIB

Index: demux_ogg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ogg.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- demux_ogg.c	5 Nov 2005 11:58:25 -0000	1.83
+++ demux_ogg.c	18 Nov 2005 14:39:18 -0000	1.84
@@ -9,8 +9,8 @@
 #include <assert.h>
 #include <math.h>
 
-#include "../mp_msg.h"
-#include "../help_mp.h"
+#include "mp_msg.h"
+#include "help_mp.h"
 #include "stream.h"
 #include "demuxer.h"
 #include "stheader.h"
@@ -161,8 +161,8 @@
 //-------- subtitle support - should be moved to decoder layer, and queue
 //                          - subtitles up in demuxer buffer...
 
-#include "../subreader.h"
-#include "../libvo/sub.h"
+#include "subreader.h"
+#include "libvo/sub.h"
 #define OGG_SUB_MAX_LINE 128
 
 static subtitle ogg_sub;

Index: demux_rawaudio.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_rawaudio.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- demux_rawaudio.c	30 Oct 2005 09:19:05 -0000	1.14
+++ demux_rawaudio.c	18 Nov 2005 14:39:19 -0000	1.15
@@ -6,7 +6,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "../m_option.h"
+#include "m_option.h"
 
 #include "stream.h"
 #include "demuxer.h"

Index: demux_rawvideo.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_rawvideo.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- demux_rawvideo.c	25 Sep 2005 17:29:45 -0000	1.9
+++ demux_rawvideo.c	18 Nov 2005 14:39:19 -0000	1.10
@@ -6,13 +6,13 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "../m_option.h"
+#include "m_option.h"
 
 #include "stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 
-#include "../libmpcodecs/img_format.h"
+#include "libmpcodecs/img_format.h"
 
 extern int demuxer_type;
 static int format = IMGFMT_I420;

Index: demux_ts.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ts.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- demux_ts.c	6 Nov 2005 16:17:17 -0000	1.39
+++ demux_ts.c	18 Nov 2005 14:39:19 -0000	1.40
@@ -35,7 +35,7 @@
 #include "stheader.h"
 
 #include "bswap.h"
-#include "../unrarlib.h"
+#include "unrarlib.h"
 #include "ms_hdr.h"
 #include "mpeg_hdr.h"
 

Index: demux_ty.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ty.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- demux_ty.c	30 Oct 2005 09:19:05 -0000	1.10
+++ demux_ty.c	18 Nov 2005 14:39:19 -0000	1.11
@@ -43,7 +43,7 @@
 #include "demuxer.h"
 #include "parse_es.h"
 #include "stheader.h"
-#include "../sub_cc.h"
+#include "sub_cc.h"
 
 extern void skip_audio_frame( sh_audio_t *sh_audio );
 extern int sub_justify;

Index: demux_ty_osd.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ty_osd.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- demux_ty_osd.c	4 Oct 2003 17:29:01 -0000	1.4
+++ demux_ty_osd.c	18 Nov 2005 14:39:19 -0000	1.5
@@ -22,9 +22,9 @@
 //#include "parse_es.h"
 //#include "stheader.h"
 //#include "mp3_hdr.h"
-//#include "../subreader.h"
-#include "../sub_cc.h"
-#include "../libvo/sub.h"
+//#include "subreader.h"
+#include "sub_cc.h"
+#include "libvo/sub.h"
 
 //#include "dvdauth.h"
 

Index: demux_vqf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_vqf.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- demux_vqf.c	30 Oct 2005 09:19:05 -0000	1.5
+++ demux_vqf.c	18 Nov 2005 14:39:19 -0000	1.6
@@ -7,7 +7,7 @@
 #include "stream.h"
 #include "demuxer.h"
 #include "stheader.h"
-#include "../libmpcodecs/vqf.h"
+#include "libmpcodecs/vqf.h"
 
 static int demux_probe_vqf(demuxer_t* demuxer) 
 {

Index: demux_xmms.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_xmms.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- demux_xmms.c	30 Oct 2005 09:19:05 -0000	1.13
+++ demux_xmms.c	18 Nov 2005 14:39:19 -0000	1.14
@@ -12,8 +12,8 @@
 #include <string.h>
 #include <sys/stat.h>
 
-#include "../m_option.h"
-#include "../libaf/af_format.h"
+#include "m_option.h"
+#include "libaf/af_format.h"
 #include "stream.h"
 #include "demuxer.h"
 #include "stheader.h"

Index: demuxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- demuxer.c	6 Nov 2005 14:14:53 -0000	1.209
+++ demuxer.c	18 Nov 2005 14:39:19 -0000	1.210
@@ -11,15 +11,15 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "help_mp.h"
-#include "../m_config.h"
+#include "m_config.h"
 
 #include "stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 #include "mf.h"
 
-#include "../libaf/af_format.h"
-#include "../libvo/fastmemcpy.h"
+#include "libaf/af_format.h"
+#include "libvo/fastmemcpy.h"
 
 extern void resync_audio_stream(sh_audio_t *sh_audio);
 

Index: dvb_tune.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/dvb_tune.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dvb_tune.c	16 Apr 2005 12:51:09 -0000	1.12
+++ dvb_tune.c	18 Nov 2005 14:39:19 -0000	1.13
@@ -53,7 +53,7 @@
 #endif
 
 #include "dvbin.h"
-#include "../mp_msg.h"
+#include "mp_msg.h"
 
 
 

Index: dvbin.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/dvbin.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- dvbin.c	18 Sep 2005 19:17:23 -0000	1.15
+++ dvbin.c	18 Nov 2005 14:39:19 -0000	1.16
@@ -44,8 +44,8 @@
 #include "stream.h"
 #include "demuxer.h"
 #include "help_mp.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 #include "dvbin.h"
 

Index: dvdnav_stream.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/dvdnav_stream.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dvdnav_stream.c	19 May 2005 19:50:39 -0000	1.4
+++ dvdnav_stream.c	18 Nov 2005 14:39:19 -0000	1.5
@@ -7,14 +7,14 @@
 #include <unistd.h>
 #include <string.h>
 #include "mp_msg.h"
-#include "../osdep/timer.h"
-#include "../input/input.h"
+#include "osdep/timer.h"
+#include "input/input.h"
 #include "stream.h"
 #include "dvdnav_stream.h"
-#include "../libvo/video_out.h"
-#include "../spudec.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "libvo/video_out.h"
+#include "spudec.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 static struct stream_priv_s {
   int track;

Index: mf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/mf.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mf.c	25 Apr 2003 10:20:15 -0000	1.9
+++ mf.c	18 Nov 2005 14:39:19 -0000	1.10
@@ -14,7 +14,7 @@
 #ifdef HAVE_GLOB
 #include <glob.h>
 #else
-#include "../osdep/glob.h"
+#include "osdep/glob.h"
 #endif
 
 #include "mp_msg.h"

Index: mp3_hdr.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/mp3_hdr.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mp3_hdr.c	1 Aug 2005 18:36:50 -0000	1.12
+++ mp3_hdr.c	18 Nov 2005 14:39:19 -0000	1.13
@@ -1,7 +1,7 @@
 #include <stdio.h>
 
 #include "config.h"
-#include "../mp_msg.h"
+#include "mp_msg.h"
 
 //----------------------- mp3 audio frame header parser -----------------------
 

Index: muxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/muxer.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- muxer.c	21 Jun 2005 18:54:50 -0000	1.9
+++ muxer.c	18 Nov 2005 14:39:19 -0000	1.10
@@ -6,7 +6,7 @@
 #include <unistd.h>
 
 #include "config.h"
-#include "../version.h"
+#include "version.h"
 
 #include "aviheader.h"
 #include "ms_hdr.h"

Index: muxer_avi.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_avi.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- muxer_avi.c	21 Feb 2005 21:45:49 -0000	1.30
+++ muxer_avi.c	18 Nov 2005 14:39:19 -0000	1.31
@@ -6,7 +6,7 @@
 #include <limits.h>
 
 #include "config.h"
-#include "../version.h"
+#include "version.h"
 
 #include "stream.h"
 #include "demuxer.h"

Index: muxer_lavf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_lavf.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- muxer_lavf.c	13 Oct 2005 18:33:56 -0000	1.11
+++ muxer_lavf.c	18 Nov 2005 14:39:19 -0000	1.12
@@ -4,8 +4,8 @@
 #include <sys/types.h>
 #include <inttypes.h>
 #include "config.h"
-#include "../version.h"
-#include "../mp_msg.h"
+#include "version.h"
+#include "mp_msg.h"
 
 #include "bswap.h"
 #include "aviheader.h"
@@ -15,7 +15,7 @@
 #include "stream.h"
 #include "demuxer.h"
 #include "stheader.h"
-#include "../m_option.h"
+#include "m_option.h"
 #include "avformat.h"
 
 extern unsigned int codec_get_wav_tag(int id);

Index: muxer_mpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_mpeg.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- muxer_mpeg.c	13 Oct 2005 18:33:56 -0000	1.21
+++ muxer_mpeg.c	18 Nov 2005 14:39:19 -0000	1.22
@@ -5,8 +5,8 @@
 #include <sys/types.h>
 
 #include "config.h"
-#include "../version.h"
-#include "../mp_msg.h"
+#include "version.h"
+#include "mp_msg.h"
 
 #include "bswap.h"
 
@@ -17,7 +17,7 @@
 #include "stream.h"
 #include "demuxer.h"
 #include "stheader.h"
-#include "../m_option.h"
+#include "m_option.h"
 #include "mpeg_hdr.h"
 
 #define PACK_HEADER_START_CODE 0x01ba

Index: muxer_rawvideo.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_rawvideo.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- muxer_rawvideo.c	19 Oct 2005 05:44:27 -0000	1.4
+++ muxer_rawvideo.c	18 Nov 2005 14:39:19 -0000	1.5
@@ -6,7 +6,7 @@
 #include <unistd.h>
 
 #include "config.h"
-#include "../version.h"
+#include "version.h"
 
 //#include "stream.h"
 //#include "demuxer.h"

Index: network.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/network.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- network.c	13 Oct 2005 18:33:56 -0000	1.118
+++ network.c	18 Nov 2005 14:39:19 -0000	1.119
@@ -25,14 +25,14 @@
 
 #include "stream.h"
 #include "demuxer.h"
-#include "../m_config.h"
+#include "m_config.h"
 
 #include "network.h"
 #include "http.h"
 #include "cookies.h"
 #include "url.h"
 
-#include "../version.h"
+#include "version.h"
 
 extern int verbose;
 extern int stream_cache_size;

Index: open.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/open.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- open.c	29 May 2005 12:53:59 -0000	1.109
+++ open.c	18 Nov 2005 14:39:19 -0000	1.110
@@ -15,7 +15,7 @@
 #include <sys/cdrio.h>
 #endif
 
-#include "../m_option.h"
+#include "m_option.h"
 #include "stream.h"
 #include "demuxer.h"
 #include "mf.h"

Index: stream.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stream.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- stream.c	18 Oct 2005 11:11:25 -0000	1.82
+++ stream.c	18 Nov 2005 14:39:20 -0000	1.83
@@ -23,13 +23,13 @@
 
 #include "mp_msg.h"
 #include "help_mp.h"
-#include "../osdep/shmem.h"
+#include "osdep/shmem.h"
 
 #include "stream.h"
 #include "demuxer.h"
 
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 
 extern int verbose; // defined in mplayer.c

Index: stream.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stream.h,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- stream.h	10 Jul 2005 14:09:45 -0000	1.72
+++ stream.h	18 Nov 2005 14:39:20 -0000	1.73
@@ -275,15 +275,15 @@
 
 #ifdef USE_MPDVDKIT
 #if (USE_MPDVDKIT == 2)
-#include "../libmpdvdkit2/dvd_reader.h"
-#include "../libmpdvdkit2/ifo_types.h"
-#include "../libmpdvdkit2/ifo_read.h"
-#include "../libmpdvdkit2/nav_read.h"
+#include "libmpdvdkit2/dvd_reader.h"
+#include "libmpdvdkit2/ifo_types.h"
+#include "libmpdvdkit2/ifo_read.h"
+#include "libmpdvdkit2/nav_read.h"
 #else
-#include "../libmpdvdkit/dvd_reader.h"
-#include "../libmpdvdkit/ifo_types.h"
-#include "../libmpdvdkit/ifo_read.h"
-#include "../libmpdvdkit/nav_read.h"
+#include "libmpdvdkit/dvd_reader.h"
+#include "libmpdvdkit/ifo_types.h"
+#include "libmpdvdkit/ifo_read.h"
+#include "libmpdvdkit/nav_read.h"
 #endif
 #else
 #include <dvdread/dvd_reader.h>

Index: stream_dvd.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stream_dvd.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- stream_dvd.c	18 Oct 2005 11:11:25 -0000	1.6
+++ stream_dvd.c	18 Nov 2005 14:39:20 -0000	1.7
@@ -22,8 +22,8 @@
 #define FIRST_PCM_AID 160
 
 #include "stream.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 /// We keep these 2 for the gui atm, but they will be removed.
 int dvd_title=0;

Index: stream_file.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stream_file.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- stream_file.c	13 Oct 2005 18:33:56 -0000	1.10
+++ stream_file.c	18 Nov 2005 14:39:20 -0000	1.11
@@ -10,8 +10,8 @@
 #include "mp_msg.h"
 #include "stream.h"
 #include "help_mp.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 static struct stream_priv_s {
   char* filename;

Index: stream_ftp.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stream_ftp.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- stream_ftp.c	14 Oct 2005 12:35:30 -0000	1.7
+++ stream_ftp.c	18 Nov 2005 14:39:20 -0000	1.8
@@ -21,8 +21,8 @@
 #include "mp_msg.h"
 #include "stream.h"
 #include "help_mp.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 static struct stream_priv_s {
   char* user;

Index: stream_netstream.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stream_netstream.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- stream_netstream.c	31 Aug 2003 18:51:05 -0000	1.7
+++ stream_netstream.c	18 Nov 2005 14:39:20 -0000	1.8
@@ -60,9 +60,9 @@
 #include "mp_msg.h"
 #include "stream.h"
 #include "help_mp.h"
-#include "../m_option.h"
-#include "../m_struct.h"
-#include "../bswap.h"
+#include "m_option.h"
+#include "m_struct.h"
+#include "bswap.h"
 
 #include "netstream.h"
 

Index: stream_smb.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stream_smb.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- stream_smb.c	19 May 2005 21:47:30 -0000	1.2
+++ stream_smb.c	18 Nov 2005 14:39:20 -0000	1.3
@@ -9,8 +9,8 @@
 #include "mp_msg.h"
 #include "stream.h"
 #include "help_mp.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 static struct stream_priv_s {
 } stream_priv_dflts = {

Index: stream_vcd.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stream_vcd.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- stream_vcd.c	3 Jul 2005 15:20:14 -0000	1.9
+++ stream_vcd.c	18 Nov 2005 14:39:20 -0000	1.10
@@ -5,8 +5,8 @@
 #include "mp_msg.h"
 #include "stream.h"
 #include "help_mp.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 #include <fcntl.h>
 #include <stdlib.h>

Index: stream_vstream.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stream_vstream.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- stream_vstream.c	27 Feb 2005 05:53:12 -0000	1.1
+++ stream_vstream.c	18 Nov 2005 14:39:20 -0000	1.2
@@ -51,8 +51,8 @@
 #include "mp_msg.h"
 #include "stream.h"
 #include "help_mp.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 #include <vstream-client.h>
 

Index: test.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/test.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- test.c	30 Mar 2003 17:14:41 -0000	1.11
+++ test.c	18 Nov 2005 14:39:20 -0000	1.12
@@ -25,7 +25,7 @@
 }
 
 // for libmpdvdkit2:
-#include "../get_path.c"
+#include "get_path.c"
 
 int verbose=5; // must be global!
 

Index: tv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tv.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- tv.c	10 Nov 2005 20:31:27 -0000	1.75
+++ tv.c	18 Nov 2005 14:39:20 -0000	1.76
@@ -29,9 +29,9 @@
 #include "demuxer.h"
 #include "stheader.h"
 
-#include "../libaf/af_format.h"
-#include "../libvo/img_format.h"
-#include "../libvo/fastmemcpy.h"
+#include "libaf/af_format.h"
+#include "libvo/img_format.h"
+#include "libvo/fastmemcpy.h"
 
 #include "tv.h"
 

Index: tv.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tv.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- tv.h	29 Jan 2005 12:24:43 -0000	1.30
+++ tv.h	18 Nov 2005 14:39:20 -0000	1.31
@@ -4,9 +4,9 @@
 extern int tv_param_on;
 
 #ifdef USE_TV
-//#include "../libao2/afmt.h"
-//#include "../libvo/img_format.h"
-//#include "../libvo/fastmemcpy.h"
+//#include "libao2/afmt.h"
+//#include "libvo/img_format.h"
+//#include "libvo/fastmemcpy.h"
 //#include "mp_msg.h"
 
 extern char *tv_param_freq;

Index: tvi_bsdbt848.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_bsdbt848.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- tvi_bsdbt848.c	25 May 2005 08:48:32 -0000	1.16
+++ tvi_bsdbt848.c	18 Nov 2005 14:39:20 -0000	1.17
@@ -64,8 +64,8 @@
 #endif
 #endif
 
-#include "../libaf/af_format.h"
-#include "../libvo/img_format.h"
+#include "libaf/af_format.h"
+#include "libvo/img_format.h"
 #include "tv.h"
 
 /* information about this file */

Index: tvi_dummy.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_dummy.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tvi_dummy.c	1 May 2004 18:30:38 -0000	1.11
+++ tvi_dummy.c	18 Nov 2005 14:39:20 -0000	1.12
@@ -7,7 +7,7 @@
 #ifdef USE_TV
 
 #include <stdio.h>
-#include "../libvo/img_format.h"
+#include "libvo/img_format.h"
 #include "tv.h"
 
 /* information about this file */

Index: tvi_v4l.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_v4l.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- tvi_v4l.c	19 Aug 2005 14:28:30 -0000	1.74
+++ tvi_v4l.c	18 Nov 2005 14:39:20 -0000	1.75
@@ -41,10 +41,10 @@
 #endif
 
 #include "mp_msg.h"
-#include "../libaf/af_format.h"
-#include "../libvo/img_format.h"
-#include "../libvo/fastmemcpy.h"
-#include "../libvo/videodev_mjpeg.h"
+#include "libaf/af_format.h"
+#include "libvo/img_format.h"
+#include "libvo/fastmemcpy.h"
+#include "libvo/videodev_mjpeg.h"
 
 #include "tv.h"
 

Index: tvi_v4l2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_v4l2.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- tvi_v4l2.c	10 Nov 2005 20:32:47 -0000	1.33
+++ tvi_v4l2.c	18 Nov 2005 14:39:20 -0000	1.34
@@ -42,9 +42,9 @@
 #endif
 #include <linux/types.h>
 #include <linux/videodev2.h>
-#include "../mp_msg.h"
-#include "../libvo/img_format.h"
-#include "../libaf/af_format.h"
+#include "mp_msg.h"
+#include "libvo/img_format.h"
+#include "libaf/af_format.h"
 #include "tv.h"
 #include "audio_in.h"
 

Index: video.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/video.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- video.c	17 Sep 2005 18:36:43 -0000	1.54
+++ video.c	18 Nov 2005 14:39:21 -0000	1.55
@@ -20,7 +20,7 @@
 #include "mpeg_hdr.h"
 
 /* sub_cc (closed captions)*/
-#include "../sub_cc.h"
+#include "sub_cc.h"
 
 /* biCompression constant */
 #define BI_RGB        0L




More information about the MPlayer-cvslog mailing list