# HG changeset patch
# User diego
# Date 1102386255 0
# Node ID a92101a7eb494e7b9e01ee6f332f49cfcb1b29e9
# Parent  ed0d8eb792f101b962ffe8cc7b6acdcd9a697116
Make include paths consistent.

diff -r ed0d8eb792f1 -r a92101a7eb49 libao2/afmt.c
--- a/libao2/afmt.c	Tue Dec 07 00:31:28 2004 +0000
+++ b/libao2/afmt.c	Tue Dec 07 02:24:15 2004 +0000
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "../config.h"
+#include "config.h"
 #include "afmt.h"
 
 char *audio_out_format_name(int format)
diff -r ed0d8eb792f1 -r a92101a7eb49 libao2/afmt.h
--- a/libao2/afmt.h	Tue Dec 07 00:31:28 2004 +0000
+++ b/libao2/afmt.h	Tue Dec 07 02:24:15 2004 +0000
@@ -9,7 +9,7 @@
 #endif
 #endif
 
-#include "../config.h" /* for native endianness */
+#include "config.h" /* for native endianness */
 
 /* standard, old OSS audio formats */
 #ifndef AFMT_MU_LAW
diff -r ed0d8eb792f1 -r a92101a7eb49 libao2/ao_alsa.c
--- a/libao2/ao_alsa.c	Tue Dec 07 00:31:28 2004 +0000
+++ b/libao2/ao_alsa.c	Tue Dec 07 02:24:15 2004 +0000
@@ -19,9 +19,9 @@
 #include <string.h>
 #include <sys/poll.h>
 
-#include "../config.h"
-#include "../mixer.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mixer.h"
+#include "mp_msg.h"
 
 #define ALSA_PCM_NEW_HW_PARAMS_API
 #define ALSA_PCM_NEW_SW_PARAMS_API
diff -r ed0d8eb792f1 -r a92101a7eb49 libao2/ao_alsa5.c
--- a/libao2/ao_alsa5.c	Tue Dec 07 00:31:28 2004 +0000
+++ b/libao2/ao_alsa5.c	Tue Dec 07 02:24:15 2004 +0000
@@ -9,14 +9,14 @@
 #include <errno.h>
 #include <sys/asoundlib.h>
 
-#include "../config.h"
+#include "config.h"
 
 #include "audio_out.h"
 #include "audio_out_internal.h"
 #include "afmt.h"
 
-#include "../mp_msg.h"
-#include "../help_mp.h"
+#include "mp_msg.h"
+#include "help_mp.h"
 
 static ao_info_t info = 
 {
diff -r ed0d8eb792f1 -r a92101a7eb49 libao2/ao_arts.c
--- a/libao2/ao_arts.c	Tue Dec 07 00:31:28 2004 +0000
+++ b/libao2/ao_arts.c	Tue Dec 07 02:24:15 2004 +0000
@@ -13,9 +13,9 @@
 #include "audio_out.h"
 #include "audio_out_internal.h"
 #include "afmt.h"
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../help_mp.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "help_mp.h"
 
 #define OBTAIN_BITRATE(a) (((a != AFMT_U8) && (a != AFMT_S8)) ? 16 : 8)
 
diff -r ed0d8eb792f1 -r a92101a7eb49 libao2/ao_dsound.c
--- a/libao2/ao_dsound.c	Tue Dec 07 00:31:28 2004 +0000
+++ b/libao2/ao_dsound.c	Tue Dec 07 02:24:15 2004 +0000
@@ -31,8 +31,8 @@
 #include "afmt.h"
 #include "audio_out.h"
 #include "audio_out_internal.h"
-#include "../mp_msg.h"
-#include "../libvo/fastmemcpy.h"
+#include "mp_msg.h"
+#include "libvo/fastmemcpy.h"
 #include "osdep/timer.h"
 
 
diff -r ed0d8eb792f1 -r a92101a7eb49 libao2/ao_dxr2.c
--- a/libao2/ao_dxr2.c	Tue Dec 07 00:31:28 2004 +0000
+++ b/libao2/ao_dxr2.c	Tue Dec 07 02:24:15 2004 +0000
@@ -4,9 +4,9 @@
 #include <sys/ioctl.h>
 #include <inttypes.h>
 #include <dxr2ioctl.h>
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../help_mp.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "help_mp.h"
 #include "bswap.h"
 
 #include "audio_out.h"
diff -r ed0d8eb792f1 -r a92101a7eb49 libao2/ao_esd.c
--- a/libao2/ao_esd.c	Tue Dec 07 00:31:28 2004 +0000
+++ b/libao2/ao_esd.c	Tue Dec 07 02:24:15 2004 +0000
@@ -16,7 +16,7 @@
  *   most likely a linux sound card driver problem)
  */
 
-#include "../config.h"
+#include "config.h"
 
 #include <sys/types.h>
 #include <sys/time.h>
@@ -35,9 +35,9 @@
 #include "audio_out.h"
 #include "audio_out_internal.h"
 #include "afmt.h"
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../help_mp.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "help_mp.h"
 
 
 #undef	ESD_DEBUG
diff -r ed0d8eb792f1 -r a92101a7eb49 libao2/ao_jack.c
--- a/libao2/ao_jack.c	Tue Dec 07 00:31:28 2004 +0000
+++ b/libao2/ao_jack.c	Tue Dec 07 02:24:15 2004 +0000
@@ -15,8 +15,8 @@
 #include "audio_out.h"
 #include "audio_out_internal.h"
 #include "afmt.h"
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 //#include "bio2jack.h"
 
diff -r ed0d8eb792f1 -r a92101a7eb49 libao2/ao_macosx.c
--- a/libao2/ao_macosx.c	Tue Dec 07 00:31:28 2004 +0000
+++ b/libao2/ao_macosx.c	Tue Dec 07 02:24:15 2004 +0000
@@ -43,7 +43,7 @@
 #include <inttypes.h>
 #include <pthread.h>
 
-#include "../mp_msg.h"
+#include "mp_msg.h"
 
 #include "audio_out.h"
 #include "audio_out_internal.h"
diff -r ed0d8eb792f1 -r a92101a7eb49 libao2/ao_mpegpes.c
--- a/libao2/ao_mpegpes.c	Tue Dec 07 00:31:28 2004 +0000
+++ b/libao2/ao_mpegpes.c	Tue Dec 07 02:24:15 2004 +0000
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
+#include "config.h"
 
 #ifdef HAVE_DVB_HEAD
 #define HAVE_DVB 1
@@ -17,8 +17,8 @@
 
 #include "afmt.h"
 
-#include "../mp_msg.h"
-#include "../help_mp.h"
+#include "mp_msg.h"
+#include "help_mp.h"
 
 #ifdef HAVE_DVB
 #ifndef HAVE_DVB_HEAD
diff -r ed0d8eb792f1 -r a92101a7eb49 libao2/ao_nas.c
--- a/libao2/ao_nas.c	Tue Dec 07 00:31:28 2004 +0000
+++ b/libao2/ao_nas.c	Tue Dec 07 02:24:15 2004 +0000
@@ -33,7 +33,7 @@
 #include <pthread.h>
 #include <audio/audiolib.h>
 
-#include "../mp_msg.h"
+#include "mp_msg.h"
 
 #include "audio_out.h"
 #include "audio_out_internal.h"
diff -r ed0d8eb792f1 -r a92101a7eb49 libao2/ao_oss.c
--- a/libao2/ao_oss.c	Tue Dec 07 00:31:28 2004 +0000
+++ b/libao2/ao_oss.c	Tue Dec 07 02:24:15 2004 +0000
@@ -11,10 +11,10 @@
 #include <string.h>
 //#include <sys/soundcard.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../mixer.h"
-#include "../help_mp.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "mixer.h"
+#include "help_mp.h"
 
 #include "afmt.h"
 
diff -r ed0d8eb792f1 -r a92101a7eb49 libao2/ao_pcm.c
--- a/libao2/ao_pcm.c	Tue Dec 07 00:31:28 2004 +0000
+++ b/libao2/ao_pcm.c	Tue Dec 07 02:24:15 2004 +0000
@@ -8,8 +8,8 @@
 #include "afmt.h"
 #include "audio_out.h"
 #include "audio_out_internal.h"
-#include "../mp_msg.h"
-#include "../help_mp.h"
+#include "mp_msg.h"
+#include "help_mp.h"
 
 
 static ao_info_t info = 
diff -r ed0d8eb792f1 -r a92101a7eb49 libao2/ao_plugin.c
--- a/libao2/ao_plugin.c	Tue Dec 07 00:31:28 2004 +0000
+++ b/libao2/ao_plugin.c	Tue Dec 07 02:24:15 2004 +0000
@@ -1,4 +1,4 @@
-#include "../config.h"
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff -r ed0d8eb792f1 -r a92101a7eb49 libao2/ao_polyp.c
--- a/libao2/ao_polyp.c	Tue Dec 07 00:31:28 2004 +0000
+++ b/libao2/ao_polyp.c	Tue Dec 07 02:24:15 2004 +0000
@@ -1,6 +1,6 @@
 #include <assert.h>
 
-#include "../config.h"
+#include "config.h"
 
 #include <polyp/polyplib.h>
 #include <polyp/polyplib-error.h>
@@ -9,8 +9,8 @@
 #include "audio_out.h"
 #include "audio_out_internal.h"
 #include "afmt.h"
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #define	POLYP_CLIENT_NAME "MPlayer"
 
diff -r ed0d8eb792f1 -r a92101a7eb49 libao2/ao_sdl.c
--- a/libao2/ao_sdl.c	Tue Dec 07 00:31:28 2004 +0000
+++ b/libao2/ao_sdl.c	Tue Dec 07 02:24:15 2004 +0000
@@ -14,9 +14,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../help_mp.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "help_mp.h"
 
 #include "audio_out.h"
 #include "audio_out_internal.h"
@@ -24,7 +24,7 @@
 #include <SDL.h>
 #include "osdep/timer.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 static ao_info_t info = 
 {
diff -r ed0d8eb792f1 -r a92101a7eb49 libao2/ao_sgi.c
--- a/libao2/ao_sgi.c	Tue Dec 07 00:31:28 2004 +0000
+++ b/libao2/ao_sgi.c	Tue Dec 07 02:24:15 2004 +0000
@@ -11,8 +11,8 @@
 
 #include "audio_out.h"
 #include "audio_out_internal.h"
-#include "../mp_msg.h"
-#include "../help_mp.h"
+#include "mp_msg.h"
+#include "help_mp.h"
 
 static ao_info_t info = 
 {
diff -r ed0d8eb792f1 -r a92101a7eb49 libao2/ao_sun.c
--- a/libao2/ao_sun.c	Tue Dec 07 00:31:28 2004 +0000
+++ b/libao2/ao_sun.c	Tue Dec 07 02:24:15 2004 +0000
@@ -20,14 +20,14 @@
 #include <stropts.h>
 #endif
 
-#include "../config.h"
-#include "../mixer.h"
+#include "config.h"
+#include "mixer.h"
 
 #include "audio_out.h"
 #include "audio_out_internal.h"
 #include "afmt.h"
-#include "../mp_msg.h"
-#include "../help_mp.h"
+#include "mp_msg.h"
+#include "help_mp.h"
 
 static ao_info_t info = 
 {
diff -r ed0d8eb792f1 -r a92101a7eb49 libao2/ao_win32.c
--- a/libao2/ao_win32.c	Tue Dec 07 00:31:28 2004 +0000
+++ b/libao2/ao_win32.c	Tue Dec 07 02:24:15 2004 +0000
@@ -26,8 +26,8 @@
 #include "afmt.h"
 #include "audio_out.h"
 #include "audio_out_internal.h"
-#include "../mp_msg.h"
-#include "../libvo/fastmemcpy.h"
+#include "mp_msg.h"
+#include "libvo/fastmemcpy.h"
 #include "osdep/timer.h"
 
 #define WAVE_FORMAT_DOLBY_AC3_SPDIF 0x0092
diff -r ed0d8eb792f1 -r a92101a7eb49 libao2/audio_out.c
--- a/libao2/audio_out.c	Tue Dec 07 00:31:28 2004 +0000
+++ b/libao2/audio_out.c	Tue Dec 07 02:24:15 2004 +0000
@@ -2,12 +2,12 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
+#include "config.h"
 #include "audio_out.h"
 #include "afmt.h"
 
-#include "../mp_msg.h"
-#include "../help_mp.h"
+#include "mp_msg.h"
+#include "help_mp.h"
 
 // there are some globals:
 ao_data_t ao_data={0,0,0,0,OUTBURST,-1,0};