From 36e1974be0234a4bad37aa43a8f158242feea948 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 18 Nov 2005 14:39:25 +0000 Subject: Unify include path handling, -I.. is in CFLAGS. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17013 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/cache2.c | 4 ++-- libmpdemux/cdda.c | 6 +++--- libmpdemux/cddb.c | 2 +- libmpdemux/cue_read.c | 4 ++-- libmpdemux/demux_asf.c | 2 +- libmpdemux/demux_audio.c | 2 +- libmpdemux/demux_mkv.c | 6 +++--- libmpdemux/demux_mov.c | 2 +- libmpdemux/demux_ogg.c | 8 ++++---- libmpdemux/demux_rawaudio.c | 2 +- libmpdemux/demux_rawvideo.c | 4 ++-- libmpdemux/demux_ts.c | 2 +- libmpdemux/demux_ty.c | 2 +- libmpdemux/demux_ty_osd.c | 6 +++--- libmpdemux/demux_vqf.c | 2 +- libmpdemux/demux_xmms.c | 4 ++-- libmpdemux/demuxer.c | 6 +++--- libmpdemux/dvb_tune.c | 2 +- libmpdemux/dvbin.c | 4 ++-- libmpdemux/dvdnav_stream.c | 12 ++++++------ libmpdemux/mf.c | 2 +- libmpdemux/mp3_hdr.c | 2 +- libmpdemux/muxer.c | 2 +- libmpdemux/muxer_avi.c | 2 +- libmpdemux/muxer_lavf.c | 6 +++--- libmpdemux/muxer_mpeg.c | 6 +++--- libmpdemux/muxer_rawvideo.c | 2 +- libmpdemux/network.c | 4 ++-- libmpdemux/open.c | 2 +- libmpdemux/stream.c | 6 +++--- libmpdemux/stream.h | 16 ++++++++-------- libmpdemux/stream_dvd.c | 4 ++-- libmpdemux/stream_file.c | 4 ++-- libmpdemux/stream_ftp.c | 4 ++-- libmpdemux/stream_netstream.c | 6 +++--- libmpdemux/stream_smb.c | 4 ++-- libmpdemux/stream_vcd.c | 4 ++-- libmpdemux/stream_vstream.c | 4 ++-- libmpdemux/test.c | 2 +- libmpdemux/tv.c | 6 +++--- libmpdemux/tv.h | 6 +++--- libmpdemux/tvi_bsdbt848.c | 4 ++-- libmpdemux/tvi_dummy.c | 2 +- libmpdemux/tvi_v4l.c | 8 ++++---- libmpdemux/tvi_v4l2.c | 6 +++--- libmpdemux/video.c | 2 +- 46 files changed, 99 insertions(+), 99 deletions(-) (limited to 'libmpdemux') diff --git a/libmpdemux/cache2.c b/libmpdemux/cache2.c index 6735b79f05..1e67e47cda 100644 --- a/libmpdemux/cache2.c +++ b/libmpdemux/cache2.c @@ -17,10 +17,10 @@ #include #include -#include "../osdep/timer.h" +#include "osdep/timer.h" #ifndef WIN32 #include -#include "../osdep/shmem.h" +#include "osdep/shmem.h" #else #include static DWORD WINAPI ThreadProc(void* s); diff --git a/libmpdemux/cdda.c b/libmpdemux/cdda.c index 81950f5940..8d082adf36 100644 --- a/libmpdemux/cdda.c +++ b/libmpdemux/cdda.c @@ -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 #include diff --git a/libmpdemux/cddb.c b/libmpdemux/cddb.c index 63868ada6a..2ec483e28a 100644 --- a/libmpdemux/cddb.c +++ b/libmpdemux/cddb.c @@ -48,7 +48,7 @@ #endif #include "cdd.h" -#include "../version.h" +#include "version.h" #include "stream.h" #include "network.h" diff --git a/libmpdemux/cue_read.c b/libmpdemux/cue_read.c index 46ef5f3652..4485f2ddc3 100644 --- a/libmpdemux/cue_read.c +++ b/libmpdemux/cue_read.c @@ -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 diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c index a8ed8b9016..ae1d9df77d 100644 --- a/libmpdemux/demux_asf.c +++ b/libmpdemux/demux_asf.c @@ -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 diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c index cae8850a1c..a472455ca2 100644 --- a/libmpdemux/demux_audio.c +++ b/libmpdemux/demux_audio.c @@ -1,6 +1,6 @@ #include "config.h" -#include "../mp_msg.h" +#include "mp_msg.h" #include #include diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index de7598c762..6491354dff 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -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 #else -#include "../libmpcodecs/native/minilzo.h" +#include "libmpcodecs/native/minilzo.h" #endif #if !defined(MIN) diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index 6b061560f7..52879ee435 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -40,7 +40,7 @@ #include #include #else -#include "../loader/qtx/qtxsdk/components.h" +#include "loader/qtx/qtxsdk/components.h" #endif #ifdef HAVE_ZLIB diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index e3f4965c40..818275905a 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -9,8 +9,8 @@ #include #include -#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 @@ extern int demux_aid_vid_mismatch; //-------- 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; diff --git a/libmpdemux/demux_rawaudio.c b/libmpdemux/demux_rawaudio.c index 8c374bc255..2da02ce955 100644 --- a/libmpdemux/demux_rawaudio.c +++ b/libmpdemux/demux_rawaudio.c @@ -6,7 +6,7 @@ #include #include -#include "../m_option.h" +#include "m_option.h" #include "stream.h" #include "demuxer.h" diff --git a/libmpdemux/demux_rawvideo.c b/libmpdemux/demux_rawvideo.c index 1bfc616dbb..b6cec47ef1 100644 --- a/libmpdemux/demux_rawvideo.c +++ b/libmpdemux/demux_rawvideo.c @@ -6,13 +6,13 @@ #include #include -#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; diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c index a9a48dfc6a..b329e9ff71 100644 --- a/libmpdemux/demux_ts.c +++ b/libmpdemux/demux_ts.c @@ -35,7 +35,7 @@ #include "stheader.h" #include "bswap.h" -#include "../unrarlib.h" +#include "unrarlib.h" #include "ms_hdr.h" #include "mpeg_hdr.h" diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c index e7f5bd6136..f23d4000b5 100644 --- a/libmpdemux/demux_ty.c +++ b/libmpdemux/demux_ty.c @@ -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; diff --git a/libmpdemux/demux_ty_osd.c b/libmpdemux/demux_ty_osd.c index 3e5ec2667d..17f27e429f 100644 --- a/libmpdemux/demux_ty_osd.c +++ b/libmpdemux/demux_ty_osd.c @@ -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" diff --git a/libmpdemux/demux_vqf.c b/libmpdemux/demux_vqf.c index 7e862b86db..092b0d6cd9 100644 --- a/libmpdemux/demux_vqf.c +++ b/libmpdemux/demux_vqf.c @@ -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) { diff --git a/libmpdemux/demux_xmms.c b/libmpdemux/demux_xmms.c index fb736a7b3f..bda2d6a0b8 100644 --- a/libmpdemux/demux_xmms.c +++ b/libmpdemux/demux_xmms.c @@ -12,8 +12,8 @@ #include #include -#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" diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 44a6b14a8f..70ae47db4b 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -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); diff --git a/libmpdemux/dvb_tune.c b/libmpdemux/dvb_tune.c index d5ec1a12ae..75f16d04bf 100644 --- a/libmpdemux/dvb_tune.c +++ b/libmpdemux/dvb_tune.c @@ -53,7 +53,7 @@ #endif #include "dvbin.h" -#include "../mp_msg.h" +#include "mp_msg.h" diff --git a/libmpdemux/dvbin.c b/libmpdemux/dvbin.c index 0d9d4cc81c..d40073937c 100644 --- a/libmpdemux/dvbin.c +++ b/libmpdemux/dvbin.c @@ -44,8 +44,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #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" diff --git a/libmpdemux/dvdnav_stream.c b/libmpdemux/dvdnav_stream.c index fe26f32247..4edf06350a 100644 --- a/libmpdemux/dvdnav_stream.c +++ b/libmpdemux/dvdnav_stream.c @@ -7,14 +7,14 @@ #include #include #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; diff --git a/libmpdemux/mf.c b/libmpdemux/mf.c index a033557777..ed11acbd7f 100644 --- a/libmpdemux/mf.c +++ b/libmpdemux/mf.c @@ -14,7 +14,7 @@ #ifdef HAVE_GLOB #include #else -#include "../osdep/glob.h" +#include "osdep/glob.h" #endif #include "mp_msg.h" diff --git a/libmpdemux/mp3_hdr.c b/libmpdemux/mp3_hdr.c index 591e04d570..cb59878466 100644 --- a/libmpdemux/mp3_hdr.c +++ b/libmpdemux/mp3_hdr.c @@ -1,7 +1,7 @@ #include #include "config.h" -#include "../mp_msg.h" +#include "mp_msg.h" //----------------------- mp3 audio frame header parser ----------------------- diff --git a/libmpdemux/muxer.c b/libmpdemux/muxer.c index 014bca5da9..fae7f453d3 100644 --- a/libmpdemux/muxer.c +++ b/libmpdemux/muxer.c @@ -6,7 +6,7 @@ #include #include "config.h" -#include "../version.h" +#include "version.h" #include "aviheader.h" #include "ms_hdr.h" diff --git a/libmpdemux/muxer_avi.c b/libmpdemux/muxer_avi.c index c156fe89bc..1585d5de55 100644 --- a/libmpdemux/muxer_avi.c +++ b/libmpdemux/muxer_avi.c @@ -6,7 +6,7 @@ #include #include "config.h" -#include "../version.h" +#include "version.h" #include "stream.h" #include "demuxer.h" diff --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c index 664a6085e5..98f4b2dc96 100644 --- a/libmpdemux/muxer_lavf.c +++ b/libmpdemux/muxer_lavf.c @@ -4,8 +4,8 @@ #include #include #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); diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c index 3479d921f3..edd9b75ee6 100644 --- a/libmpdemux/muxer_mpeg.c +++ b/libmpdemux/muxer_mpeg.c @@ -5,8 +5,8 @@ #include #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 diff --git a/libmpdemux/muxer_rawvideo.c b/libmpdemux/muxer_rawvideo.c index eff3eb019f..9ef82c3ab1 100644 --- a/libmpdemux/muxer_rawvideo.c +++ b/libmpdemux/muxer_rawvideo.c @@ -6,7 +6,7 @@ #include #include "config.h" -#include "../version.h" +#include "version.h" //#include "stream.h" //#include "demuxer.h" diff --git a/libmpdemux/network.c b/libmpdemux/network.c index 12982ca1d2..e172454a49 100644 --- a/libmpdemux/network.c +++ b/libmpdemux/network.c @@ -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; diff --git a/libmpdemux/open.c b/libmpdemux/open.c index d1723c7b80..9d813d63f7 100644 --- a/libmpdemux/open.c +++ b/libmpdemux/open.c @@ -15,7 +15,7 @@ #include #endif -#include "../m_option.h" +#include "m_option.h" #include "stream.h" #include "demuxer.h" #include "mf.h" diff --git a/libmpdemux/stream.c b/libmpdemux/stream.c index 05a4607d3b..84babf0ed5 100644 --- a/libmpdemux/stream.c +++ b/libmpdemux/stream.c @@ -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 diff --git a/libmpdemux/stream.h b/libmpdemux/stream.h index da3f71e0f3..19c9e7a3fc 100644 --- a/libmpdemux/stream.h +++ b/libmpdemux/stream.h @@ -275,15 +275,15 @@ extern char * audio_stream; #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 diff --git a/libmpdemux/stream_dvd.c b/libmpdemux/stream_dvd.c index 0da08459bc..eb0048b5a2 100644 --- a/libmpdemux/stream_dvd.c +++ b/libmpdemux/stream_dvd.c @@ -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; diff --git a/libmpdemux/stream_file.c b/libmpdemux/stream_file.c index b6c1028f5f..ba2c3b133c 100644 --- a/libmpdemux/stream_file.c +++ b/libmpdemux/stream_file.c @@ -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; diff --git a/libmpdemux/stream_ftp.c b/libmpdemux/stream_ftp.c index 19693dbaee..7cc01004b6 100644 --- a/libmpdemux/stream_ftp.c +++ b/libmpdemux/stream_ftp.c @@ -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; diff --git a/libmpdemux/stream_netstream.c b/libmpdemux/stream_netstream.c index e054a25412..5316f0512f 100644 --- a/libmpdemux/stream_netstream.c +++ b/libmpdemux/stream_netstream.c @@ -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" diff --git a/libmpdemux/stream_smb.c b/libmpdemux/stream_smb.c index d641e38f37..c92b1da432 100644 --- a/libmpdemux/stream_smb.c +++ b/libmpdemux/stream_smb.c @@ -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 = { diff --git a/libmpdemux/stream_vcd.c b/libmpdemux/stream_vcd.c index ed4cd84834..2e765d5d12 100644 --- a/libmpdemux/stream_vcd.c +++ b/libmpdemux/stream_vcd.c @@ -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 #include diff --git a/libmpdemux/stream_vstream.c b/libmpdemux/stream_vstream.c index b2967706ea..f32144f93a 100644 --- a/libmpdemux/stream_vstream.c +++ b/libmpdemux/stream_vstream.c @@ -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 diff --git a/libmpdemux/test.c b/libmpdemux/test.c index 9369b7e649..7e7ebd9d65 100644 --- a/libmpdemux/test.c +++ b/libmpdemux/test.c @@ -25,7 +25,7 @@ int mp_input_check_interrupt(int time){ } // for libmpdvdkit2: -#include "../get_path.c" +#include "get_path.c" int verbose=5; // must be global! diff --git a/libmpdemux/tv.c b/libmpdemux/tv.c index 4070da7ac2..678d8c584b 100644 --- a/libmpdemux/tv.c +++ b/libmpdemux/tv.c @@ -29,9 +29,9 @@ int tv_param_on = 0; #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" diff --git a/libmpdemux/tv.h b/libmpdemux/tv.h index df57161ade..10b4221ab4 100644 --- a/libmpdemux/tv.h +++ b/libmpdemux/tv.h @@ -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; diff --git a/libmpdemux/tvi_bsdbt848.c b/libmpdemux/tvi_bsdbt848.c index bebe4b635a..bd6f0253ef 100644 --- a/libmpdemux/tvi_bsdbt848.c +++ b/libmpdemux/tvi_bsdbt848.c @@ -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 */ diff --git a/libmpdemux/tvi_dummy.c b/libmpdemux/tvi_dummy.c index 6efb2db415..151d102489 100644 --- a/libmpdemux/tvi_dummy.c +++ b/libmpdemux/tvi_dummy.c @@ -7,7 +7,7 @@ #ifdef USE_TV #include -#include "../libvo/img_format.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 b3f962b302..0b376b4d9d 100644 --- a/libmpdemux/tvi_v4l.c +++ b/libmpdemux/tvi_v4l.c @@ -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" diff --git a/libmpdemux/tvi_v4l2.c b/libmpdemux/tvi_v4l2.c index 1d406606f6..9e67c9c4f1 100644 --- a/libmpdemux/tvi_v4l2.c +++ b/libmpdemux/tvi_v4l2.c @@ -42,9 +42,9 @@ known issues: #endif #include #include -#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" diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 8a2f09c588..0c73bc7774 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -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 -- cgit v1.2.3