[MPlayer-cvslog] CVS: main/mp3lib dct36_3dnow.c, 1.2, 1.3 dct64_3dnow.c, 1.8, 1.9 dct64_MMX.c, 1.5, 1.6 dct64_k7.c, 1.10, 1.11 decod386.c, 1.19, 1.20 decode_MMX.c, 1.10, 1.11 decode_i586.c, 1.9, 1.10 mpg123.h, 1.10, 1.11 sr1.c, 1.32, 1.33 tabinit_MMX.c, 1.7, 1.8 test.c, 1.4, 1.5

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main/mp3lib
In directory mail:/var2/tmp/cvs-serv7321/mp3lib

Modified Files:
	dct36_3dnow.c dct64_3dnow.c dct64_MMX.c dct64_k7.c decod386.c 
	decode_MMX.c decode_i586.c mpg123.h sr1.c tabinit_MMX.c test.c 
Log Message:
Unify include paths, -I.. is in CFLAGS.


Index: dct36_3dnow.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/dct36_3dnow.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dct36_3dnow.c	15 Apr 2005 22:21:34 -0000	1.2
+++ dct36_3dnow.c	15 Nov 2005 18:14:07 -0000	1.3
@@ -29,7 +29,7 @@
 
 #define real float /* ugly - but only way */
 
-#include "../mangle.h"
+#include "mangle.h"
 
 #ifdef __DCT36_OPTIMIZE_FOR_K7
 void dct36_3dnowex(real *inbuf, real *o1,

Index: dct64_3dnow.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/dct64_3dnow.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dct64_3dnow.c	11 Nov 2004 13:33:30 -0000	1.8
+++ dct64_3dnow.c	15 Nov 2005 18:14:07 -0000	1.9
@@ -9,8 +9,8 @@
 */
 #define real float /* ugly - but only way */
 
-#include "../config.h"
-#include "../mangle.h"
+#include "config.h"
+#include "mangle.h"
 
 static unsigned long long int attribute_used __attribute__((aligned(8))) x_plus_minus_3dnow = 0x8000000000000000ULL;
 static float attribute_used plus_1f = 1.0;

Index: dct64_MMX.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/dct64_MMX.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dct64_MMX.c	22 Oct 2003 20:58:46 -0000	1.5
+++ dct64_MMX.c	15 Nov 2005 18:14:07 -0000	1.6
@@ -3,7 +3,7 @@
 * See ChangeLog of mpg123-0.59s-pre.1 for detail
 * Applied to mplayer by Nick Kurshev <nickols_k at mail.ru>
 */
-#include "../mangle.h"
+#include "mangle.h"
 #define real float /* ugly - but only way */
 
 void dct64_MMX(real *a,real *b,real *c)

Index: dct64_k7.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/dct64_k7.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dct64_k7.c	11 Nov 2004 13:33:30 -0000	1.10
+++ dct64_k7.c	15 Nov 2005 18:14:07 -0000	1.11
@@ -9,8 +9,8 @@
 */
 #define real float /* ugly - but only way */
 
-#include "../config.h"
-#include "../mangle.h"
+#include "config.h"
+#include "mangle.h"
 
 static unsigned long long int attribute_used __attribute__((aligned(8))) x_plus_minus_3dnow = 0x8000000000000000ULL;
 static float attribute_used plus_1f = 1.0;

Index: decod386.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/decod386.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- decod386.c	15 Apr 2005 22:21:34 -0000	1.19
+++ decod386.c	15 Nov 2005 18:14:07 -0000	1.20
@@ -17,7 +17,7 @@
  */
 
 
-#include "../config.h"
+#include "config.h"
 
 #if 0
  /* old WRITE_SAMPLE */

Index: decode_MMX.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/decode_MMX.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- decode_MMX.c	26 Apr 2004 10:09:31 -0000	1.10
+++ decode_MMX.c	15 Nov 2005 18:14:07 -0000	1.11
@@ -7,8 +7,8 @@
  * Local ChangeLog:
  * - Partial loops unrolling and removing MOVW insn from loops
 */
-#include "../config.h"
-#include "../mangle.h"
+#include "config.h"
+#include "mangle.h"
 #define real float /* ugly - but only way */
 
 static unsigned long long attribute_used __attribute__((aligned(8))) null_one = 0x0000ffff0000ffffULL;

Index: decode_i586.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/decode_i586.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- decode_i586.c	25 Oct 2005 19:29:51 -0000	1.9
+++ decode_i586.c	15 Nov 2005 18:14:07 -0000	1.10
@@ -29,8 +29,8 @@
 *
 * $Id$
 */
-#include "../config.h"
-#include "../mangle.h"
+#include "config.h"
+#include "mangle.h"
 #define real float /* ugly - but only way */
 
 static long attribute_used buffs[1088]={0};

Index: mpg123.h
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/mpg123.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mpg123.h	25 Oct 2005 17:08:49 -0000	1.10
+++ mpg123.h	15 Nov 2005 18:14:07 -0000	1.11
@@ -9,7 +9,7 @@
  * used source: musicout.h from mpegaudio package
  */
 
-#include "../config.h"
+#include "config.h"
 
 #ifndef M_PI
 #define M_PI		3.141592653589793238462

Index: sr1.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/sr1.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sr1.c	15 Apr 2005 22:21:34 -0000	1.32
+++ sr1.c	15 Nov 2005 18:14:07 -0000	1.33
@@ -25,9 +25,9 @@
 #include "huffman.h"
 #include "mp3.h"
 #include "bswap.h"
-#include "../cpudetect.h"
-//#include "../liba52/mm_accel.h"
-#include "../mp_msg.h"
+#include "cpudetect.h"
+//#include "liba52/mm_accel.h"
+#include "mp_msg.h"
 
 #include "fastmemcpy.h"
 
@@ -394,7 +394,7 @@
 extern void dct64_MMX_3dnowex(real *, real *, real *);
 void (*dct64_MMX_func)(real *, real *, real *);
 
-#include "../cpudetect.h"
+#include "cpudetect.h"
 
 // Init decoder tables.  Call first, once!
 #ifdef USE_FAKE_MONO

Index: tabinit_MMX.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/tabinit_MMX.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tabinit_MMX.c	26 Apr 2004 19:47:50 -0000	1.7
+++ tabinit_MMX.c	15 Nov 2005 18:14:07 -0000	1.8
@@ -3,8 +3,8 @@
  * See ChangeLog of mpg123-0.59s-pre.1 for detail
  * Applied to mplayer by Nick Kurshev <nickols_k at mail.ru>
 */
-#include "../config.h"
-#include "../mangle.h"
+#include "config.h"
+#include "mangle.h"
 
 long __attribute__((aligned(8))) mp3lib_decwins [544];
 

Index: test.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- test.c	4 Jul 2003 21:38:17 -0000	1.4
+++ test.c	15 Nov 2005 18:14:07 -0000	1.5
@@ -12,7 +12,7 @@
 #include "mp3lib/mp3.h"
 #include "config.h"
 
-#include "../cpudetect.h"
+#include "cpudetect.h"
 extern CpuCaps gCpuCaps;
 
 static inline unsigned int GetTimer(){