diff options
author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-05-31 20:29:27 +0200 |
---|---|---|
committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-05-31 20:29:27 +0200 |
commit | 37d4ab77290e4b906df51a7012576e6aec0fc605 (patch) | |
tree | 22603e7f58b7b98c64439035cfce98e4e70939b5 /contrib/libfaad/diff_to_faad2_cvs.patch | |
parent | 0a2bd906547bf468205defb30c317fca3dac397b (diff) | |
download | xine-lib-37d4ab77290e4b906df51a7012576e6aec0fc605.tar.gz xine-lib-37d4ab77290e4b906df51a7012576e6aec0fc605.tar.bz2 |
Move libfaad in contrib/ and contextually move the plugin in src/libxineadec/.
--HG--
rename : src/libfaad/Makefile.am => contrib/libfaad/Makefile.am
rename : src/libfaad/analysis.h => contrib/libfaad/analysis.h
rename : src/libfaad/bits.c => contrib/libfaad/bits.c
rename : src/libfaad/bits.h => contrib/libfaad/bits.h
rename : src/libfaad/cfft.c => contrib/libfaad/cfft.c
rename : src/libfaad/cfft.h => contrib/libfaad/cfft.h
rename : src/libfaad/cfft_tab.h => contrib/libfaad/cfft_tab.h
rename : src/libfaad/codebook/Makefile.am => contrib/libfaad/codebook/Makefile.am
rename : src/libfaad/codebook/hcb.h => contrib/libfaad/codebook/hcb.h
rename : src/libfaad/codebook/hcb_1.h => contrib/libfaad/codebook/hcb_1.h
rename : src/libfaad/codebook/hcb_10.h => contrib/libfaad/codebook/hcb_10.h
rename : src/libfaad/codebook/hcb_11.h => contrib/libfaad/codebook/hcb_11.h
rename : src/libfaad/codebook/hcb_2.h => contrib/libfaad/codebook/hcb_2.h
rename : src/libfaad/codebook/hcb_3.h => contrib/libfaad/codebook/hcb_3.h
rename : src/libfaad/codebook/hcb_4.h => contrib/libfaad/codebook/hcb_4.h
rename : src/libfaad/codebook/hcb_5.h => contrib/libfaad/codebook/hcb_5.h
rename : src/libfaad/codebook/hcb_6.h => contrib/libfaad/codebook/hcb_6.h
rename : src/libfaad/codebook/hcb_7.h => contrib/libfaad/codebook/hcb_7.h
rename : src/libfaad/codebook/hcb_8.h => contrib/libfaad/codebook/hcb_8.h
rename : src/libfaad/codebook/hcb_9.h => contrib/libfaad/codebook/hcb_9.h
rename : src/libfaad/codebook/hcb_sf.h => contrib/libfaad/codebook/hcb_sf.h
rename : src/libfaad/common.c => contrib/libfaad/common.c
rename : src/libfaad/common.h => contrib/libfaad/common.h
rename : src/libfaad/decoder.c => contrib/libfaad/decoder.c
rename : src/libfaad/decoder.h => contrib/libfaad/decoder.h
rename : src/libfaad/diff_to_faad2_cvs.patch => contrib/libfaad/diff_to_faad2_cvs.patch
rename : src/libfaad/drc.c => contrib/libfaad/drc.c
rename : src/libfaad/drc.h => contrib/libfaad/drc.h
rename : src/libfaad/drm_dec.c => contrib/libfaad/drm_dec.c
rename : src/libfaad/drm_dec.h => contrib/libfaad/drm_dec.h
rename : src/libfaad/error.c => contrib/libfaad/error.c
rename : src/libfaad/error.h => contrib/libfaad/error.h
rename : src/libfaad/faad.h => contrib/libfaad/faad.h
rename : src/libfaad/filtbank.c => contrib/libfaad/filtbank.c
rename : src/libfaad/filtbank.h => contrib/libfaad/filtbank.h
rename : src/libfaad/fixed.h => contrib/libfaad/fixed.h
rename : src/libfaad/hcr.c => contrib/libfaad/hcr.c
rename : src/libfaad/huffman.c => contrib/libfaad/huffman.c
rename : src/libfaad/huffman.h => contrib/libfaad/huffman.h
rename : src/libfaad/ic_predict.c => contrib/libfaad/ic_predict.c
rename : src/libfaad/ic_predict.h => contrib/libfaad/ic_predict.h
rename : src/libfaad/iq_table.h => contrib/libfaad/iq_table.h
rename : src/libfaad/is.c => contrib/libfaad/is.c
rename : src/libfaad/is.h => contrib/libfaad/is.h
rename : src/libfaad/kbd_win.h => contrib/libfaad/kbd_win.h
rename : src/libfaad/lt_predict.c => contrib/libfaad/lt_predict.c
rename : src/libfaad/lt_predict.h => contrib/libfaad/lt_predict.h
rename : src/libfaad/mdct.c => contrib/libfaad/mdct.c
rename : src/libfaad/mdct.h => contrib/libfaad/mdct.h
rename : src/libfaad/mdct_tab.h => contrib/libfaad/mdct_tab.h
rename : src/libfaad/mp4.c => contrib/libfaad/mp4.c
rename : src/libfaad/mp4.h => contrib/libfaad/mp4.h
rename : src/libfaad/ms.c => contrib/libfaad/ms.c
rename : src/libfaad/ms.h => contrib/libfaad/ms.h
rename : src/libfaad/output.c => contrib/libfaad/output.c
rename : src/libfaad/output.h => contrib/libfaad/output.h
rename : src/libfaad/pns.c => contrib/libfaad/pns.c
rename : src/libfaad/pns.h => contrib/libfaad/pns.h
rename : src/libfaad/ps_dec.c => contrib/libfaad/ps_dec.c
rename : src/libfaad/ps_dec.h => contrib/libfaad/ps_dec.h
rename : src/libfaad/ps_syntax.c => contrib/libfaad/ps_syntax.c
rename : src/libfaad/ps_tables.h => contrib/libfaad/ps_tables.h
rename : src/libfaad/pulse.c => contrib/libfaad/pulse.c
rename : src/libfaad/pulse.h => contrib/libfaad/pulse.h
rename : src/libfaad/rvlc.c => contrib/libfaad/rvlc.c
rename : src/libfaad/rvlc.h => contrib/libfaad/rvlc.h
rename : src/libfaad/sbr_dct.c => contrib/libfaad/sbr_dct.c
rename : src/libfaad/sbr_dct.h => contrib/libfaad/sbr_dct.h
rename : src/libfaad/sbr_dec.c => contrib/libfaad/sbr_dec.c
rename : src/libfaad/sbr_dec.h => contrib/libfaad/sbr_dec.h
rename : src/libfaad/sbr_e_nf.c => contrib/libfaad/sbr_e_nf.c
rename : src/libfaad/sbr_e_nf.h => contrib/libfaad/sbr_e_nf.h
rename : src/libfaad/sbr_fbt.c => contrib/libfaad/sbr_fbt.c
rename : src/libfaad/sbr_fbt.h => contrib/libfaad/sbr_fbt.h
rename : src/libfaad/sbr_hfadj.c => contrib/libfaad/sbr_hfadj.c
rename : src/libfaad/sbr_hfadj.h => contrib/libfaad/sbr_hfadj.h
rename : src/libfaad/sbr_hfgen.c => contrib/libfaad/sbr_hfgen.c
rename : src/libfaad/sbr_hfgen.h => contrib/libfaad/sbr_hfgen.h
rename : src/libfaad/sbr_huff.c => contrib/libfaad/sbr_huff.c
rename : src/libfaad/sbr_huff.h => contrib/libfaad/sbr_huff.h
rename : src/libfaad/sbr_noise.h => contrib/libfaad/sbr_noise.h
rename : src/libfaad/sbr_qmf.c => contrib/libfaad/sbr_qmf.c
rename : src/libfaad/sbr_qmf.h => contrib/libfaad/sbr_qmf.h
rename : src/libfaad/sbr_qmf_c.h => contrib/libfaad/sbr_qmf_c.h
rename : src/libfaad/sbr_syntax.c => contrib/libfaad/sbr_syntax.c
rename : src/libfaad/sbr_syntax.h => contrib/libfaad/sbr_syntax.h
rename : src/libfaad/sbr_tf_grid.c => contrib/libfaad/sbr_tf_grid.c
rename : src/libfaad/sbr_tf_grid.h => contrib/libfaad/sbr_tf_grid.h
rename : src/libfaad/sine_win.h => contrib/libfaad/sine_win.h
rename : src/libfaad/specrec.c => contrib/libfaad/specrec.c
rename : src/libfaad/specrec.h => contrib/libfaad/specrec.h
rename : src/libfaad/ssr.c => contrib/libfaad/ssr.c
rename : src/libfaad/ssr.h => contrib/libfaad/ssr.h
rename : src/libfaad/ssr_fb.c => contrib/libfaad/ssr_fb.c
rename : src/libfaad/ssr_fb.h => contrib/libfaad/ssr_fb.h
rename : src/libfaad/ssr_ipqf.c => contrib/libfaad/ssr_ipqf.c
rename : src/libfaad/ssr_ipqf.h => contrib/libfaad/ssr_ipqf.h
rename : src/libfaad/ssr_win.h => contrib/libfaad/ssr_win.h
rename : src/libfaad/structs.h => contrib/libfaad/structs.h
rename : src/libfaad/syntax.c => contrib/libfaad/syntax.c
rename : src/libfaad/syntax.h => contrib/libfaad/syntax.h
rename : src/libfaad/tns.c => contrib/libfaad/tns.c
rename : src/libfaad/tns.h => contrib/libfaad/tns.h
rename : src/libfaad/xine_faad_decoder.c => src/libxineadec/xine_faad_decoder.c
Diffstat (limited to 'contrib/libfaad/diff_to_faad2_cvs.patch')
-rw-r--r-- | contrib/libfaad/diff_to_faad2_cvs.patch | 101 |
1 files changed, 101 insertions, 0 deletions
diff --git a/contrib/libfaad/diff_to_faad2_cvs.patch b/contrib/libfaad/diff_to_faad2_cvs.patch new file mode 100644 index 000000000..0d8490f2e --- /dev/null +++ b/contrib/libfaad/diff_to_faad2_cvs.patch @@ -0,0 +1,101 @@ +--- faad2-cvs-15092004/libfaad/common.h 2004-09-08 03:43:12.000000000 -0600 ++++ libfaad/common.h 2005-10-29 19:21:53.000000000 -0600 +@@ -147,23 +147,6 @@ + + /* END COMPILE TIME DEFINITIONS */ + +-#if defined(_WIN32) && !defined(__MINGW32__) +- +-#include <stdlib.h> +- +-typedef unsigned __int64 uint64_t; +-typedef unsigned __int32 uint32_t; +-typedef unsigned __int16 uint16_t; +-typedef unsigned __int8 uint8_t; +-typedef __int64 int64_t; +-typedef __int32 int32_t; +-typedef __int16 int16_t; +-typedef __int8 int8_t; +-typedef float float32_t; +- +- +-#else +- + #include <stdio.h> + #if HAVE_SYS_TYPES_H + # include <sys/types.h> +@@ -188,6 +171,8 @@ + #if HAVE_STRINGS_H + # include <strings.h> + #endif ++ ++/* precedence defining int-types by header files for all platforms */ + #if HAVE_INTTYPES_H + # include <inttypes.h> + #else +@@ -195,6 +180,17 @@ + # include <stdint.h> + # else + /* we need these... */ ++# ifdef WIN32 ++typedef unsigned __int64 uint64_t; ++typedef unsigned __int32 uint32_t; ++typedef unsigned __int16 uint16_t; ++typedef unsigned __int8 uint8_t; ++typedef __int64 int64_t; ++typedef __int32 int32_t; ++typedef __int16 int16_t; ++typedef __int8 int8_t; ++# else /* WIN32 */ ++typedef float float32_t; + typedef unsigned long long uint64_t; + typedef unsigned long uint32_t; + typedef unsigned short uint16_t; +@@ -203,6 +199,7 @@ + typedef long int32_t; + typedef short int16_t; + typedef char int8_t; ++# endif /* WIN32 */ + # endif + #endif + #if HAVE_UNISTD_H +@@ -227,8 +224,6 @@ + # endif + #endif + +-#endif +- + #ifdef WORDS_BIGENDIAN + #define ARCH_IS_BIG_ENDIAN + #endif +@@ -289,6 +284,7 @@ + } + + ++#ifndef HAVE_LRINTF + #if defined(_WIN32) && !defined(__MINGW32__) + #define HAS_LRINTF + static INLINE int lrintf(float f) +@@ -315,7 +311,7 @@ + return i; + } + #endif +- ++#endif + + #ifdef __ICL /* only Intel C compiler has fmath ??? */ + +--- faad2-cvs-15092004/libfaad/bits.h 2004-09-04 08:56:28.000000000 -0600 ++++ libfaad/bits.h 2005-10-29 19:21:53.000000000 -0600 +@@ -56,9 +56,9 @@ + } bitfile; + + +-#if defined (_WIN32) && !defined(_WIN32_WCE) && !defined(__MINGW32__) ++#if defined(_MSC_VER) + #define BSWAP(a) __asm mov eax,a __asm bswap eax __asm mov a, eax +-#elif defined(LINUX) || defined(DJGPP) || defined(__MINGW32__) ++#elif defined(LINUX) || defined(DJGPP) || defined (__MINGW32__) || defined (__CYGWIN__) + #define BSWAP(a) __asm__ ( "bswapl %0\n" : "=r" (a) : "0" (a) ) + #else + #define BSWAP(a) \ |