diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-11-18 14:39:25 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-11-18 14:39:25 +0000 |
commit | 36e1974be0234a4bad37aa43a8f158242feea948 (patch) | |
tree | 48acc9380a5f904849da0ac0e9b6a349244a1620 /libmpcodecs | |
parent | b47f1ff7ed387fccd2974abde2903d2d3bc33320 (diff) | |
download | mpv-36e1974be0234a4bad37aa43a8f158242feea948.tar.bz2 mpv-36e1974be0234a4bad37aa43a8f158242feea948.tar.xz |
Unify include path handling, -I.. is in CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17013 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
105 files changed, 331 insertions, 331 deletions
diff --git a/libmpcodecs/ad_faad.c b/libmpcodecs/ad_faad.c index d405c1e7ef..9f358dfcfa 100644 --- a/libmpcodecs/ad_faad.c +++ b/libmpcodecs/ad_faad.c @@ -27,7 +27,7 @@ LIBAD_EXTERN(faad) #ifndef USE_INTERNAL_FAAD #include <faad.h> #else -#include "../libfaad2/faad.h" +#include "libfaad2/faad.h" #endif /* configure maximum supported channels, * diff --git a/libmpcodecs/ad_hwac3.c b/libmpcodecs/ad_hwac3.c index cb587e31a5..329c8ca62b 100644 --- a/libmpcodecs/ad_hwac3.c +++ b/libmpcodecs/ad_hwac3.c @@ -18,7 +18,7 @@ #include "ad_internal.h" -#include "../liba52/a52.h" +#include "liba52/a52.h" static int isdts = -1; diff --git a/libmpcodecs/ad_internal.h b/libmpcodecs/ad_internal.h index 91890ebdb4..dafed1eb11 100644 --- a/libmpcodecs/ad_internal.h +++ b/libmpcodecs/ad_internal.h @@ -1,6 +1,6 @@ #include "codec-cfg.h" -#include "../libaf/af_format.h" +#include "libaf/af_format.h" #include "stream.h" #include "demuxer.h" diff --git a/libmpcodecs/ad_liba52.c b/libmpcodecs/ad_liba52.c index 066c433d5d..a8a8317deb 100644 --- a/libmpcodecs/ad_liba52.c +++ b/libmpcodecs/ad_liba52.c @@ -14,10 +14,10 @@ #include "cpudetect.h" -#include "../libaf/af_format.h" +#include "libaf/af_format.h" -#include "../liba52/a52.h" -#include "../liba52/mm_accel.h" +#include "liba52/a52.h" +#include "liba52/mm_accel.h" static sample_t * a52_samples; static a52_state_t a52_state; diff --git a/libmpcodecs/ad_mp3lib.c b/libmpcodecs/ad_mp3lib.c index 6ef422961b..2605bb08f2 100644 --- a/libmpcodecs/ad_mp3lib.c +++ b/libmpcodecs/ad_mp3lib.c @@ -18,7 +18,7 @@ static ad_info_t info = LIBAD_EXTERN(mp3lib) -#include "../mp3lib/mp3.h" +#include "mp3lib/mp3.h" extern int fakemono; diff --git a/libmpcodecs/ad_mpc.c b/libmpcodecs/ad_mpc.c index 98671f14f4..d318c0b111 100644 --- a/libmpcodecs/ad_mpc.c +++ b/libmpcodecs/ad_mpc.c @@ -13,8 +13,8 @@ #include "config.h" #include "ad_internal.h" -#include "../libaf/af_format.h" -#include "../libvo/fastmemcpy.h" +#include "libaf/af_format.h" +#include "libvo/fastmemcpy.h" static ad_info_t info = { diff --git a/libmpcodecs/ad_pcm.c b/libmpcodecs/ad_pcm.c index 7e67c938ae..3af366bfb3 100644 --- a/libmpcodecs/ad_pcm.c +++ b/libmpcodecs/ad_pcm.c @@ -4,7 +4,7 @@ #include "config.h" #include "ad_internal.h" -#include "../libaf/af_format.h" +#include "libaf/af_format.h" static ad_info_t info = { diff --git a/libmpcodecs/ad_qtaudio.c b/libmpcodecs/ad_qtaudio.c index c865b68568..9caea3cf78 100644 --- a/libmpcodecs/ad_qtaudio.c +++ b/libmpcodecs/ad_qtaudio.c @@ -4,7 +4,7 @@ #include <inttypes.h> #include "config.h" -#include "../mp_msg.h" +#include "mp_msg.h" #if defined(USE_QTX_CODECS) || defined(MACOSX) #include "wine/windef.h" diff --git a/libmpcodecs/ad_realaud.c b/libmpcodecs/ad_realaud.c index 6d6d6a4acc..18039d49b6 100644 --- a/libmpcodecs/ad_realaud.c +++ b/libmpcodecs/ad_realaud.c @@ -158,7 +158,7 @@ static int load_syms_linux(char *path) #ifdef USE_WIN32DLL #ifdef WIN32_LOADER -#include "../loader/ldt_keeper.h" +#include "loader/ldt_keeper.h" #endif void* WINAPI LoadLibraryA(char* name); void* WINAPI GetProcAddress(void* handle,char *func); diff --git a/libmpcodecs/ad_twin.c b/libmpcodecs/ad_twin.c index f0779516bf..8059106ced 100644 --- a/libmpcodecs/ad_twin.c +++ b/libmpcodecs/ad_twin.c @@ -7,9 +7,9 @@ #include "ad_internal.h" #include "vqf.h" -#include "../../loader/ldt_keeper.h" +#include "loader/ldt_keeper.h" #include "wine/windef.h" -#include "../libaf/af_format.h" +#include "libaf/af_format.h" #include "help_mp.h" diff --git a/libmpcodecs/ae.c b/libmpcodecs/ae.c index 307e3ae599..fc50965d08 100644 --- a/libmpcodecs/ae.c +++ b/libmpcodecs/ae.c @@ -9,7 +9,7 @@ #include "ms_hdr.h" #include "muxer.h" #include "ae.h" -#include "../config.h" +#include "config.h" #include "ae_pcm.h" diff --git a/libmpcodecs/ae_faac.c b/libmpcodecs/ae_faac.c index 2deca5932f..46041ec489 100644 --- a/libmpcodecs/ae_faac.c +++ b/libmpcodecs/ae_faac.c @@ -5,9 +5,9 @@ #include <string.h> #include <sys/types.h> #include "m_option.h" -#include "../mp_msg.h" +#include "mp_msg.h" #include "aviheader.h" -#include "../libaf/af_format.h" +#include "libaf/af_format.h" #include "ms_hdr.h" #include "muxer.h" #include <faac.h> diff --git a/libmpcodecs/ae_lame.c b/libmpcodecs/ae_lame.c index d062ff37a7..d47e91dc0f 100644 --- a/libmpcodecs/ae_lame.c +++ b/libmpcodecs/ae_lame.c @@ -5,14 +5,14 @@ #include <string.h> #include <sys/types.h> #include "m_option.h" -#include "../mp_msg.h" +#include "mp_msg.h" #include "aviheader.h" #include "ms_hdr.h" #include "muxer.h" -#include "../help_mp.h" +#include "help_mp.h" #include "ae_pcm.h" -#include "../libaf/af_format.h" -#include "../libmpdemux/mp3_hdr.h" +#include "libaf/af_format.h" +#include "libmpdemux/mp3_hdr.h" #undef CDECL #include <lame/lame.h> diff --git a/libmpcodecs/ae_lavc.c b/libmpcodecs/ae_lavc.c index ce6ca9766d..d4048403c6 100644 --- a/libmpcodecs/ae_lavc.c +++ b/libmpcodecs/ae_lavc.c @@ -5,14 +5,14 @@ #include <string.h> #include <sys/types.h> #include "m_option.h" -#include "../mp_msg.h" +#include "mp_msg.h" #include "aviheader.h" #include "ms_hdr.h" #include "muxer.h" #include "ae_lavc.h" #include "help_mp.h" -#include "../config.h" -#include "../libaf/af_format.h" +#include "config.h" +#include "libaf/af_format.h" #ifdef USE_LIBAVCODEC_SO #include <ffmpeg/avcodec.h> #else diff --git a/libmpcodecs/ae_pcm.c b/libmpcodecs/ae_pcm.c index a6d8fab2ed..c862b3ed57 100644 --- a/libmpcodecs/ae_pcm.c +++ b/libmpcodecs/ae_pcm.c @@ -5,9 +5,9 |