diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-01-18 00:45:42 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-01-18 00:45:42 +0000 |
| commit | d797ae8a0d0e011515b37e76cbc0c0b869714ea3 (patch) | |
| tree | 79afd6c091d61ee0c366aaa3e698fb2881fea9be /contrib | |
| parent | 3f8d8860a25c457120281d64e6405c08e59b67b8 (diff) | |
| parent | c8f8261d199af4956aeaf387b2fde41baf905f83 (diff) | |
| download | xine-lib-d797ae8a0d0e011515b37e76cbc0c0b869714ea3.tar.gz xine-lib-d797ae8a0d0e011515b37e76cbc0c0b869714ea3.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/libxineadec/gsm610/long_term.c => contrib/gsm610/long_term.c
rename : src/libxineadec/gsm610/lpc.c => contrib/gsm610/lpc.c
rename : src/libxineadec/gsm610/rpe.c => contrib/gsm610/rpe.c
rename : src/libxineadec/gsm610/short_term.c => contrib/gsm610/short_term.c
rename : src/libfaad/common.h => contrib/libfaad/common.h
rename : src/xine-engine/broadcaster.h => include/xine/broadcaster.h
rename : src/xine-engine/buffer.h => include/xine/buffer.h
rename : src/xine-engine/refcounter.h => include/xine/refcounter.h
rename : src/xine-engine/video_out.h => include/xine/video_out.h
rename : src/xine-engine/vo_scale.h => include/xine/vo_scale.h
rename : src/xine-utils/xineutils.h => include/xine/xineutils.h
rename : src/libxineadec/fooaudio.c => src/audio_dec/fooaudio.c
rename : src/liba52/xine_a52_decoder.c => src/audio_dec/xine_a52_decoder.c
rename : src/libdts/xine_dts_decoder.c => src/audio_dec/xine_dts_decoder.c
rename : src/libfaad/xine_faad_decoder.c => src/audio_dec/xine_faad_decoder.c
rename : src/libxineadec/xine_lpcm_decoder.c => src/audio_dec/xine_lpcm_decoder.c
rename : src/libmad/xine_mad_decoder.c => src/audio_dec/xine_mad_decoder.c
rename : src/libmusepack/xine_musepack_decoder.c => src/audio_dec/xine_musepack_decoder.c
rename : src/libxineadec/nsf.c => src/combined/nsf_decoder.c
rename : src/libspucc/cc_decoder.c => src/spu_dec/cc_decoder.c
rename : src/libspudec/xine_spu_decoder.c => src/spu_dec/spu_decoder.c
rename : src/libspudec/spu.c => src/spu_dec/spudec.c
rename : src/libspudec/spu.h => src/spu_dec/spudec.h
rename : src/libsputext/xine_sputext_decoder.c => src/spu_dec/sputext_decoder.c
rename : src/libspucc/xine_cc_decoder.c => src/spu_dec/xine_cc_decoder.c
rename : src/libxinevdec/bitplane.c => src/video_dec/bitplane.c
rename : src/libxinevdec/foovideo.c => src/video_dec/foovideo.c
rename : src/libxinevdec/gdkpixbuf.c => src/video_dec/gdkpixbuf.c
rename : src/libxinevdec/image.c => src/video_dec/image.c
rename : src/libmpeg2/slice_xvmc_vld.c => src/video_dec/libmpeg2/slice_xvmc_vld.c
rename : src/libmpeg2/xine_mpeg2_decoder.c => src/video_dec/libmpeg2/xine_mpeg2_decoder.c
rename : src/libmpeg2new/include/Makefile.am => src/video_dec/libmpeg2new/include/Makefile.am
rename : src/libmpeg2new/libmpeg2/motion_comp_vis.c => src/video_dec/libmpeg2new/libmpeg2/motion_comp_vis.c
rename : src/libmpeg2new/xine_mpeg2new_decoder.c => src/video_dec/libmpeg2new/xine_mpeg2new_decoder.c
rename : src/libxinevdec/rgb.c => src/video_dec/rgb.c
rename : src/libxinevdec/yuv.c => src/video_dec/yuv.c
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/gsm610/long_term.c | 4 | ||||
| -rw-r--r-- | contrib/gsm610/lpc.c | 4 | ||||
| -rw-r--r-- | contrib/gsm610/rpe.c | 4 | ||||
| -rw-r--r-- | contrib/gsm610/short_term.c | 4 | ||||
| -rw-r--r-- | contrib/libfaad/common.h | 2 |
5 files changed, 17 insertions, 1 deletions
diff --git a/contrib/gsm610/long_term.c b/contrib/gsm610/long_term.c index 671d98cc1..578483927 100644 --- a/contrib/gsm610/long_term.c +++ b/contrib/gsm610/long_term.c @@ -6,6 +6,10 @@ /* $Header: /nfshome/cvs/xine-lib/src/libxineadec/gsm610/long_term.c,v 1.3 2003/12/07 15:34:30 f1rmb Exp $ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <stdio.h> #include <xine/xineutils.h> diff --git a/contrib/gsm610/lpc.c b/contrib/gsm610/lpc.c index d85f56111..04a54d781 100644 --- a/contrib/gsm610/lpc.c +++ b/contrib/gsm610/lpc.c @@ -6,6 +6,10 @@ /* $Header: /nfshome/cvs/xine-lib/src/libxineadec/gsm610/lpc.c,v 1.3 2003/12/07 15:34:30 f1rmb Exp $ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <stdio.h> #include <xine/xineutils.h> diff --git a/contrib/gsm610/rpe.c b/contrib/gsm610/rpe.c index 68d495b3b..2f8f79bbb 100644 --- a/contrib/gsm610/rpe.c +++ b/contrib/gsm610/rpe.c @@ -6,6 +6,10 @@ /* $Header: /nfshome/cvs/xine-lib/src/libxineadec/gsm610/rpe.c,v 1.3 2003/12/07 15:34:30 f1rmb Exp $ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <stdio.h> #include <xine/xineutils.h> #include "private.h" diff --git a/contrib/gsm610/short_term.c b/contrib/gsm610/short_term.c index 34a9e7734..e1d8c9afe 100644 --- a/contrib/gsm610/short_term.c +++ b/contrib/gsm610/short_term.c @@ -6,6 +6,10 @@ /* $Header: /nfshome/cvs/xine-lib/src/libxineadec/gsm610/short_term.c,v 1.3 2003/12/07 15:34:30 f1rmb Exp $ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <stdio.h> #include <xine/xineutils.h> #include "private.h" diff --git a/contrib/libfaad/common.h b/contrib/libfaad/common.h index 4d2769526..4419f1eb5 100644 --- a/contrib/libfaad/common.h +++ b/contrib/libfaad/common.h @@ -36,7 +36,7 @@ extern "C" { #endif #ifdef HAVE_CONFIG_H -# include <config.h> +# include "config.h" #endif #if 1 |