Mercurial > mplayer.hg
changeset 16989:e7a129082fda
Unify include paths, -I.. is in CFLAGS.
author | diego |
---|---|
date | Tue, 15 Nov 2005 18:14:07 +0000 |
parents | 3c0923afe14a |
children | 4c168a0b85e0 |
files | mp3lib/dct36_3dnow.c mp3lib/dct64_3dnow.c mp3lib/dct64_MMX.c mp3lib/dct64_k7.c mp3lib/decod386.c mp3lib/decode_MMX.c mp3lib/decode_i586.c mp3lib/mpg123.h mp3lib/sr1.c mp3lib/tabinit_MMX.c mp3lib/test.c |
diffstat | 11 files changed, 19 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/mp3lib/dct36_3dnow.c Tue Nov 15 17:55:39 2005 +0000 +++ b/mp3lib/dct36_3dnow.c Tue Nov 15 18:14:07 2005 +0000 @@ -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,
--- a/mp3lib/dct64_3dnow.c Tue Nov 15 17:55:39 2005 +0000 +++ b/mp3lib/dct64_3dnow.c Tue Nov 15 18:14:07 2005 +0000 @@ -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;
--- a/mp3lib/dct64_MMX.c Tue Nov 15 17:55:39 2005 +0000 +++ b/mp3lib/dct64_MMX.c Tue Nov 15 18:14:07 2005 +0000 @@ -3,7 +3,7 @@ * See ChangeLog of mpg123-0.59s-pre.1 for detail * Applied to mplayer by Nick Kurshev <nickols_k@mail.ru> */ -#include "../mangle.h" +#include "mangle.h" #define real float /* ugly - but only way */ void dct64_MMX(real *a,real *b,real *c)
--- a/mp3lib/dct64_k7.c Tue Nov 15 17:55:39 2005 +0000 +++ b/mp3lib/dct64_k7.c Tue Nov 15 18:14:07 2005 +0000 @@ -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;
--- a/mp3lib/decod386.c Tue Nov 15 17:55:39 2005 +0000 +++ b/mp3lib/decod386.c Tue Nov 15 18:14:07 2005 +0000 @@ -17,7 +17,7 @@ */ -#include "../config.h" +#include "config.h" #if 0 /* old WRITE_SAMPLE */
--- a/mp3lib/decode_MMX.c Tue Nov 15 17:55:39 2005 +0000 +++ b/mp3lib/decode_MMX.c Tue Nov 15 18:14:07 2005 +0000 @@ -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;
--- a/mp3lib/decode_i586.c Tue Nov 15 17:55:39 2005 +0000 +++ b/mp3lib/decode_i586.c Tue Nov 15 18:14:07 2005 +0000 @@ -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};
--- a/mp3lib/mpg123.h Tue Nov 15 17:55:39 2005 +0000 +++ b/mp3lib/mpg123.h Tue Nov 15 18:14:07 2005 +0000 @@ -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
--- a/mp3lib/sr1.c Tue Nov 15 17:55:39 2005 +0000 +++ b/mp3lib/sr1.c Tue Nov 15 18:14:07 2005 +0000 @@ -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
--- a/mp3lib/tabinit_MMX.c Tue Nov 15 17:55:39 2005 +0000 +++ b/mp3lib/tabinit_MMX.c Tue Nov 15 18:14:07 2005 +0000 @@ -3,8 +3,8 @@ * See ChangeLog of mpg123-0.59s-pre.1 for detail * Applied to mplayer by Nick Kurshev <nickols_k@mail.ru> */ -#include "../config.h" -#include "../mangle.h" +#include "config.h" +#include "mangle.h" long __attribute__((aligned(8))) mp3lib_decwins [544];