summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/audio_dec/fooaudio.c4
-rw-r--r--src/audio_dec/xine_a52_decoder.c2
-rw-r--r--src/audio_dec/xine_dts_decoder.c4
-rw-r--r--src/audio_dec/xine_faad_decoder.c4
-rw-r--r--src/audio_dec/xine_lpcm_decoder.c4
-rw-r--r--src/audio_dec/xine_mad_decoder.c2
-rw-r--r--src/audio_dec/xine_musepack_decoder.c4
-rw-r--r--src/audio_out/audio_jack_out.c3
-rw-r--r--src/combined/nsf_decoder.c4
-rw-r--r--src/demuxers/demux_tta.c4
-rw-r--r--src/dxr3/dxr3_decode_spu.c4
-rw-r--r--src/dxr3/dxr3_decode_video.c4
-rw-r--r--src/input/input_dvb.c2
-rw-r--r--src/input/libdvdnav/bswap.h2
-rw-r--r--src/input/libdvdnav/diff_against_cvs.patch2
-rw-r--r--src/input/libdvdnav/dvd_reader.h2
-rw-r--r--src/input/libdvdnav/md5.c2
-rw-r--r--src/input/libreal/asmrp.c4
-rw-r--r--src/input/libreal/real.c4
-rw-r--r--src/input/libreal/rmff.c4
-rw-r--r--src/input/libreal/sdpplin.c4
-rw-r--r--src/input/librtsp/rtsp.c2
-rw-r--r--src/input/librtsp/rtsp_session.c4
-rw-r--r--src/input/pnm.c2
-rw-r--r--src/libreal/xine_real_audio_decoder.c4
-rw-r--r--src/libreal/xine_real_video_decoder.c4
-rw-r--r--src/libw32dll/w32codec.c4
-rw-r--r--src/libw32dll/wine/driver.c2
-rw-r--r--src/libw32dll/wine/elfdll.c2
-rw-r--r--src/libw32dll/wine/pe_resource.c2
-rw-r--r--src/libw32dll/wine/resource.c2
-rw-r--r--src/libw32dll/wine/vfl.c2
-rw-r--r--src/post/audio/audio_filters.c3
-rw-r--r--src/post/audio/stretch.c4
-rw-r--r--src/post/audio/upmix.c4
-rw-r--r--src/post/audio/upmix_mono.c4
-rw-r--r--src/post/audio/volnorm.c4
-rw-r--r--src/post/deinterlace/xine_plugin.c4
-rw-r--r--src/post/mosaico/mosaico.c2
-rw-r--r--src/post/planar/boxblur.c4
-rw-r--r--src/post/planar/denoise3d.c4
-rw-r--r--src/post/planar/eq.c4
-rw-r--r--src/post/planar/eq2.c4
-rw-r--r--src/post/planar/noise.c4
-rw-r--r--src/post/planar/planar.c4
-rw-r--r--src/post/planar/pp.c2
-rw-r--r--src/post/planar/unsharp.c4
-rw-r--r--src/post/visualizations/fftgraph.c4
-rw-r--r--src/post/visualizations/fftscope.c4
-rw-r--r--src/post/visualizations/fooviz.c4
-rw-r--r--src/post/visualizations/oscope.c4
-rw-r--r--src/spu_dec/cc_decoder.c4
-rw-r--r--src/spu_dec/spu_decoder.c4
-rw-r--r--src/spu_dec/spudec.c4
-rw-r--r--src/spu_dec/spudec.h2
-rw-r--r--src/spu_dec/sputext_decoder.c4
-rw-r--r--src/spu_dec/xine_cc_decoder.c4
-rw-r--r--src/video_dec/bitplane.c4
-rw-r--r--src/video_dec/foovideo.c4
-rw-r--r--src/video_dec/gdkpixbuf.c5
-rw-r--r--src/video_dec/image.c4
-rw-r--r--src/video_dec/libmpeg2/slice_xvmc_vld.c4
-rw-r--r--src/video_dec/libmpeg2/xine_mpeg2_decoder.c4
-rw-r--r--src/video_dec/libmpeg2new/include/Makefile.am4
-rw-r--r--src/video_dec/libmpeg2new/libmpeg2/motion_comp_vis.c4
-rw-r--r--src/video_dec/libmpeg2new/xine_mpeg2new_decoder.c4
-rw-r--r--src/video_dec/rgb.c4
-rw-r--r--src/video_dec/yuv.c4
-rw-r--r--src/video_out/video_out_directx.c4
-rw-r--r--src/xine-engine/alphablend.c4
-rw-r--r--src/xine-engine/broadcaster.c4
-rw-r--r--src/xine-engine/demux.c3
-rw-r--r--src/xine-engine/refcounter.c5
-rw-r--r--src/xine-engine/video_overlay.c4
-rw-r--r--src/xine-engine/vo_scale.c4
-rw-r--r--src/xine-utils/xine_buffer.c4
-rw-r--r--src/xine-utils/xmllexer.c4
-rw-r--r--src/xine-utils/xmlparser.c4
78 files changed, 255 insertions, 22 deletions
diff --git a/src/audio_dec/fooaudio.c b/src/audio_dec/fooaudio.c
index 756b9019a..7e202d627 100644
--- a/src/audio_dec/fooaudio.c
+++ b/src/audio_dec/fooaudio.c
@@ -22,6 +22,10 @@
* place of the data it should actually send.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/audio_dec/xine_a52_decoder.c b/src/audio_dec/xine_a52_decoder.c
index 98d3f1a9a..02ed2b622 100644
--- a/src/audio_dec/xine_a52_decoder.c
+++ b/src/audio_dec/xine_a52_decoder.c
@@ -27,7 +27,7 @@
/* avoid compiler warnings */
#define _BSD_SOURCE 1
-#include <config.h>
+#include "config.h"
#include <stdlib.h>
#include <unistd.h>
diff --git a/src/audio_dec/xine_dts_decoder.c b/src/audio_dec/xine_dts_decoder.c
index 9699b5d0d..345d821fd 100644
--- a/src/audio_dec/xine_dts_decoder.c
+++ b/src/audio_dec/xine_dts_decoder.c
@@ -26,6 +26,10 @@
* @author James Courtier-Dutton (2001-12-09)
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#ifndef __sun
/* required for swab() */
#define _XOPEN_SOURCE 500
diff --git a/src/audio_dec/xine_faad_decoder.c b/src/audio_dec/xine_faad_decoder.c
index 9e0fd9546..9646c0744 100644
--- a/src/audio_dec/xine_faad_decoder.c
+++ b/src/audio_dec/xine_faad_decoder.c
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/src/audio_dec/xine_lpcm_decoder.c b/src/audio_dec/xine_lpcm_decoder.c
index b2761d35f..ebaceee8d 100644
--- a/src/audio_dec/xine_lpcm_decoder.c
+++ b/src/audio_dec/xine_lpcm_decoder.c
@@ -25,6 +25,10 @@
* @date 2001-08-31 Added LPCM rate sensing
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#ifndef __sun
#define _XOPEN_SOURCE 500
#endif
diff --git a/src/audio_dec/xine_mad_decoder.c b/src/audio_dec/xine_mad_decoder.c
index 992c78fea..4bda91b40 100644
--- a/src/audio_dec/xine_mad_decoder.c
+++ b/src/audio_dec/xine_mad_decoder.c
@@ -22,7 +22,7 @@
#include <stdlib.h>
#include <string.h>
-#include <config.h>
+#include "config.h"
#ifdef HAVE_MAD_H
#include <mad.h>
diff --git a/src/audio_dec/xine_musepack_decoder.c b/src/audio_dec/xine_musepack_decoder.c
index fcc16836d..76e5642f4 100644
--- a/src/audio_dec/xine_musepack_decoder.c
+++ b/src/audio_dec/xine_musepack_decoder.c
@@ -27,6 +27,10 @@
* @todo Add support for seeking.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/audio_out/audio_jack_out.c b/src/audio_out/audio_jack_out.c
index f1a011a6c..c73cf4b5c 100644
--- a/src/audio_out/audio_jack_out.c
+++ b/src/audio_out/audio_jack_out.c
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#include <stdio.h>
#include <errno.h>
diff --git a/src/combined/nsf_decoder.c b/src/combined/nsf_decoder.c
index 4ae920dfd..babeffae0 100644
--- a/src/combined/nsf_decoder.c
+++ b/src/combined/nsf_decoder.c
@@ -21,6 +21,10 @@
* http://www.baisoku.org/
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/demuxers/demux_tta.c b/src/demuxers/demux_tta.c
index ce6ddb23a..6537c1444 100644
--- a/src/demuxers/demux_tta.c
+++ b/src/demuxers/demux_tta.c
@@ -21,6 +21,10 @@
* Inspired by tta libavformat demuxer by Alex Beregszaszi
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#define LOG_MODULE "demux_tta"
#define LOG_VERBOSE
diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c
index 74dcc3aad..fdbddf8a8 100644
--- a/src/dxr3/dxr3_decode_spu.c
+++ b/src/dxr3/dxr3_decode_spu.c
@@ -17,6 +17,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
/* dxr3 spu decoder plugin.
* Accepts the spu data from xine and sends it directly to the
diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c
index a6be99758..8e57cc462 100644
--- a/src/dxr3/dxr3_decode_video.c
+++ b/src/dxr3/dxr3_decode_video.c
@@ -17,6 +17,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
/* dxr3 video decoder plugin.
* Accepts the video data from xine and sends it directly to the
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index 4b8b47e43..2c25b9863 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -67,7 +67,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
/* pthread.h must be included first so rest of the headers are imported
diff --git a/src/input/libdvdnav/bswap.h b/src/input/libdvdnav/bswap.h
index 2a2d222fe..23f0251d6 100644
--- a/src/input/libdvdnav/bswap.h
+++ b/src/input/libdvdnav/bswap.h
@@ -20,7 +20,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <config.h>
+#include "config.h"
#if defined(WORDS_BIGENDIAN)
/* All bigendian systems are fine, just ignore the swaps. */
diff --git a/src/input/libdvdnav/diff_against_cvs.patch b/src/input/libdvdnav/diff_against_cvs.patch
index b9b1dbe8b..c3d69758e 100644
--- a/src/input/libdvdnav/diff_against_cvs.patch
+++ b/src/input/libdvdnav/diff_against_cvs.patch
@@ -323,7 +323,7 @@ diff -u -p -u -r1.5 dvd_reader.h
-#ifdef _MSC_VER
+#ifdef HAVE_CONFIG_H
- #include <config.h>
+ #include "config.h"
+#endif
+#ifdef _MSC_VER
diff --git a/src/input/libdvdnav/dvd_reader.h b/src/input/libdvdnav/dvd_reader.h
index e1b051c00..c7b3f9df8 100644
--- a/src/input/libdvdnav/dvd_reader.h
+++ b/src/input/libdvdnav/dvd_reader.h
@@ -22,7 +22,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#ifdef _MSC_VER
diff --git a/src/input/libdvdnav/md5.c b/src/input/libdvdnav/md5.c
index 2bfdddee4..16b7b0690 100644
--- a/src/input/libdvdnav/md5.c
+++ b/src/input/libdvdnav/md5.c
@@ -21,7 +21,7 @@
/* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. */
#ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
#endif
#include <sys/types.h>
diff --git a/src/input/libreal/asmrp.c b/src/input/libreal/asmrp.c
index 48b54f3a0..5eb25d7b4 100644
--- a/src/input/libreal/asmrp.c
+++ b/src/input/libreal/asmrp.c
@@ -32,6 +32,10 @@
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/src/input/libreal/real.c b/src/input/libreal/real.c
index d9f175748..7fa64cc15 100644
--- a/src/input/libreal/real.c
+++ b/src/input/libreal/real.c
@@ -21,6 +21,10 @@
* adopted from joschkas real tools.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
#include <string.h>
diff --git a/src/input/libreal/rmff.c b/src/input/libreal/rmff.c
index 1600e967a..8142246b6 100644
--- a/src/input/libreal/rmff.c
+++ b/src/input/libreal/rmff.c
@@ -21,6 +21,10 @@
* adopted from joschkas real tools
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#define LOG_MODULE "rmff"
#define LOG_VERBOSE
/*
diff --git a/src/input/libreal/sdpplin.c b/src/input/libreal/sdpplin.c
index 9db1e383a..0ca20b04d 100644
--- a/src/input/libreal/sdpplin.c
+++ b/src/input/libreal/sdpplin.c
@@ -19,6 +19,10 @@
*
* sdp/sdpplin parser.
*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#define LOG_MODULE "sdpplin"
#define LOG_VERBOSE
diff --git a/src/input/librtsp/rtsp.c b/src/input/librtsp/rtsp.c
index cc1f398ac..e8f816bb2 100644
--- a/src/input/librtsp/rtsp.c
+++ b/src/input/librtsp/rtsp.c
@@ -22,7 +22,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <config.h>
diff --git a/src/input/librtsp/rtsp_session.c b/src/input/librtsp/rtsp_session.c
index 88e0f87d1..0194af3fd 100644
--- a/src/input/librtsp/rtsp_session.c
+++ b/src/input/librtsp/rtsp_session.c
@@ -20,6 +20,10 @@
* high level interface to rtsp servers.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/src/input/pnm.c b/src/input/pnm.c
index 3caaf41bd..6e63b9f58 100644
--- a/src/input/pnm.c
+++ b/src/input/pnm.c
@@ -22,7 +22,7 @@
*/
#ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
#endif
#include <config.h>
diff --git a/src/libreal/xine_real_audio_decoder.c b/src/libreal/xine_real_audio_decoder.c
index d8117e78c..3a4a6a506 100644
--- a/src/libreal/xine_real_audio_decoder.c
+++ b/src/libreal/xine_real_audio_decoder.c
@@ -22,6 +22,10 @@
* code inspired by work from Florian Schneider for the MPlayer Project
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdlib.h>
#include <string.h>
diff --git a/src/libreal/xine_real_video_decoder.c b/src/libreal/xine_real_video_decoder.c
index 86cfc09dc..b02a83953 100644
--- a/src/libreal/xine_real_video_decoder.c
+++ b/src/libreal/xine_real_video_decoder.c
@@ -22,6 +22,10 @@
* code inspired by work from Florian Schneider for the MPlayer Project
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdlib.h>
#include <string.h>
diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c
index a7c65cb07..e1d5a81a0 100644
--- a/src/libw32dll/w32codec.c
+++ b/src/libw32dll/w32codec.c
@@ -21,6 +21,10 @@
* DirectShow support by Miguel Freitas (Nov/2001)
* DMO support (Dez/2002)
*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#include <stdlib.h>
#include <stdio.h>
diff --git a/src/libw32dll/wine/driver.c b/src/libw32dll/wine/driver.c
index ef8761628..296fcd25a 100644
--- a/src/libw32dll/wine/driver.c
+++ b/src/libw32dll/wine/driver.c
@@ -1,4 +1,4 @@
-#include <config.h>
+#include "config.h"
#include <stdio.h>
#ifdef HAVE_MALLOC_H
#include <malloc.h>
diff --git a/src/libw32dll/wine/elfdll.c b/src/libw32dll/wine/elfdll.c
index 7853ffe71..e81467b5a 100644
--- a/src/libw32dll/wine/elfdll.c
+++ b/src/libw32dll/wine/elfdll.c
@@ -3,7 +3,7 @@
*
* Copyright 1999 Bertho A. Stultiens
*/
-#include <config.h>
+#include "config.h"
#ifdef HAVE_LIBDL
diff --git a/src/libw32dll/wine/pe_resource.c b/src/libw32dll/wine/pe_resource.c
index 6acfef2f0..16dc85389 100644
--- a/src/libw32dll/wine/pe_resource.c
+++ b/src/libw32dll/wine/pe_resource.c
@@ -9,7 +9,7 @@
* Copyright 1995 Alexandre Julliard
* Copyright 1997 Marcus Meissner
*/
-#include <config.h>
+#include "config.h"
#include <stdlib.h>
#include <sys/types.h>
diff --git a/src/libw32dll/wine/resource.c b/src/libw32dll/wine/resource.c
index 9d4fa80bb..a38c1dd1e 100644
--- a/src/libw32dll/wine/resource.c
+++ b/src/libw32dll/wine/resource.c
@@ -4,7 +4,7 @@
* Copyright 1993 Robert J. Amstadt
* Copyright 1995 Alexandre Julliard
*/
-#include <config.h>
+#include "config.h"
#include <assert.h>
#include <stdio.h>
diff --git a/src/libw32dll/wine/vfl.c b/src/libw32dll/wine/vfl.c
index e8eb7969f..f509995de 100644
--- a/src/libw32dll/wine/vfl.c
+++ b/src/libw32dll/wine/vfl.c
@@ -1,7 +1,7 @@
/*
* Copyright 1998 Marcus Meissner
*/
-#include <config.h>
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/post/audio/audio_filters.c b/src/post/audio/audio_filters.c
index 517591b71..448353b52 100644
--- a/src/post/audio/audio_filters.c
+++ b/src/post/audio/audio_filters.c
@@ -20,6 +20,9 @@
* catalog for audio filter plugins
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#include <xine/xine_internal.h>
#include <xine/xineutils.h>
diff --git a/src/post/audio/stretch.c b/src/post/audio/stretch.c
index c082eefa6..36ac18dd6 100644
--- a/src/post/audio/stretch.c
+++ b/src/post/audio/stretch.c
@@ -20,6 +20,10 @@
* Time stretch by a given factor, optionally preserving pitch
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
#include <xine/xine_internal.h>
diff --git a/src/post/audio/upmix.c b/src/post/audio/upmix.c
index 3e5c2e65b..24df657d0 100644
--- a/src/post/audio/upmix.c
+++ b/src/post/audio/upmix.c
@@ -24,6 +24,10 @@
* E.g. Converts Stereo into Surround 5.1
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
#include <xine/xine_internal.h>
diff --git a/src/post/audio/upmix_mono.c b/src/post/audio/upmix_mono.c
index 193989586..c59638be4 100644
--- a/src/post/audio/upmix_mono.c
+++ b/src/post/audio/upmix_mono.c
@@ -23,6 +23,10 @@
* It simply converts Mono into Stereo.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
#define LOG_MODULE "upmix_mono"
diff --git a/src/post/audio/volnorm.c b/src/post/audio/volnorm.c
index f42d712f1..e473d6a09 100644
--- a/src/post/audio/volnorm.c
+++ b/src/post/audio/volnorm.c
@@ -22,6 +22,10 @@
* & Pierre Lombard.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
#include <math.h>
diff --git a/src/post/deinterlace/xine_plugin.c b/src/post/deinterlace/xine_plugin.c
index 74aa821de..9dffb255d 100644
--- a/src/post/deinterlace/xine_plugin.c
+++ b/src/post/deinterlace/xine_plugin.c
@@ -23,6 +23,10 @@
* heavily based on tvtime.sf.net by Billy Biggs
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
/*
#define LOG
*/
diff --git a/src/post/mosaico/mosaico.c b/src/post/mosaico/mosaico.c
index 0a4031bde..b009f13fe 100644
--- a/src/post/mosaico/mosaico.c
+++ b/src/post/mosaico/mosaico.c
@@ -23,7 +23,7 @@
*/
#ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
#endif
#define LOG_MODULE "mosaico"
diff --git a/src/post/planar/boxblur.c b/src/post/planar/boxblur.c
index b27e7e561..182d088c4 100644
--- a/src/post/planar/boxblur.c
+++ b/src/post/planar/boxblur.c
@@ -21,6 +21,10 @@
* Copyright (C) 2002 Michael Niedermayer <michaelni@gmx.at>
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <xine/xine_internal.h>
#include <xine/post.h>
#include <xine/xineutils.h>
diff --git a/src/post/planar/denoise3d.c b/src/post/planar/denoise3d.c
index cadaafae0..c87f5f078 100644
--- a/src/post/planar/denoise3d.c
+++ b/src/post/planar/denoise3d.c
@@ -21,6 +21,10 @@
* Copyright (C) 2003 Daniel Moreno <comac@comac.darktech.org>
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <xine/xine_internal.h>
#include <xine/post.h>
#include <xine/xineutils.h>
diff --git a/src/post/planar/eq.c b/src/post/planar/eq.c
index 128616e6d..4e2460bb8 100644
--- a/src/post/planar/eq.c
+++ b/src/post/planar/eq.c
@@ -21,6 +21,10 @@
* Copyright (C) Richard Felker
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <xine/xine_internal.h>
#include <xine/post.h>
#include <xine/xineutils.h>
diff --git a/src/post/planar/eq2.c b/src/post/planar/eq2.c
index cd3ad36d7..aeffcd4ae 100644
--- a/src/post/planar/eq2.c
+++ b/src/post/planar/eq2.c
@@ -25,6 +25,10 @@
* Richard Felker (original MMX contrast/brightness code (vf_eq.c))
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <xine/xine_internal.h>
#include <xine/post.h>
#include <xine/xineutils.h>
diff --git a/src/post/planar/noise.c b/src/post/planar/noise.c
index 5c353522f..3c6fd70dd 100644
--- a/src/post/planar/noise.c
+++ b/src/post/planar/noise.c
@@ -21,6 +21,10 @@
* is copyright 2002 Michael Niedermayer <michaelni@gmx.at>
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <xine/xine_internal.h>
#include <xine/post.h>
#include <xine/xineutils.h>
diff --git a/src/post/planar/planar.c b/src/post/planar/planar.c
index 1d0c59254..35177230a 100644
--- a/src/post/planar/planar.c
+++ b/src/post/planar/planar.c
@@ -20,6 +20,10 @@
* catalog for planar post plugins
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <xine/xine_internal.h>
#include <xine/post.h>
#include <xine/xineutils.h>
diff --git a/src/post/planar/pp.c b/src/post/planar/pp.c
index 01dd89c40..64ebadfe9 100644
--- a/src/post/planar/pp.c
+++ b/src/post/planar/pp.c
@@ -21,7 +21,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <config.h>
diff --git a/src/post/planar/unsharp.c b/src/post/planar/unsharp.c
index 2f8b74496..506f19f4c 100644
--- a/src/post/planar/unsharp.c
+++ b/src/post/planar/unsharp.c
@@ -21,6 +21,10 @@
* Copyright (C) 2002 Rémi Guyomarch <rguyom@pobox.com>
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <xine/xine_internal.h>
#include <xine/post.h>
#include <xine/xineutils.h>
diff --git a/src/post/visualizations/fftgraph.c b/src/post/visualizations/fftgraph.c
index b881b9bec..1f38d3478 100644
--- a/src/post/visualizations/fftgraph.c
+++ b/src/post/visualizations/fftgraph.c
@@ -21,6 +21,10 @@
* by Thibaut Mattern (tmattern@noos.fr)
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
#include <math.h>
diff --git a/src/post/visualizations/fftscope.c b/src/post/visualizations/fftscope.c
index eca2e2f93..b6af2fc6c 100644
--- a/src/post/visualizations/fftscope.c
+++ b/src/post/visualizations/fftscope.c
@@ -23,6 +23,10 @@
* FFT code by Steve Haehnichen, originally licensed under GPL v1
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
#include <math.h>
diff --git a/src/post/visualizations/fooviz.c b/src/post/visualizations/fooviz.c
index 722ae9f7c..751cb9bac 100644
--- a/src/post/visualizations/fooviz.c
+++ b/src/post/visualizations/fooviz.c
@@ -24,6 +24,10 @@
* colors on each iteration.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
#include <xine/xine_internal.h>
diff --git a/src/post/visualizations/oscope.c b/src/post/visualizations/oscope.c
index 3e783cce7..c6861406e 100644
--- a/src/post/visualizations/oscope.c
+++ b/src/post/visualizations/oscope.c
@@ -21,6 +21,10 @@
* by Mike Melanson (melanson@pcisys.net)
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
#include <xine/xine_internal.h>
diff --git a/src/spu_dec/cc_decoder.c b/src/spu_dec/cc_decoder.c
index 7c6504f1a..71e2578db 100644
--- a/src/spu_dec/cc_decoder.c
+++ b/src/spu_dec/cc_decoder.c
@@ -27,6 +27,10 @@
* available at http://sourceforge.net/projects/ccdecoder/.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/spu_dec/spu_decoder.c b/src/spu_dec/spu_decoder.c
index 6257c4f06..0234c8d23 100644
--- a/src/spu_dec/spu_decoder.c
+++ b/src/spu_dec/spu_decoder.c
@@ -22,6 +22,10 @@
* stuff needed to turn libspu into a xine decoder plugin
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/src/spu_dec/spudec.c b/src/spu_dec/spudec.c
index 95f969aa7..0e8621c54 100644
--- a/src/spu_dec/spudec.c
+++ b/src/spu_dec/spudec.c
@@ -37,6 +37,10 @@
* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
diff --git a/src/spu_dec/spudec.h b/src/spu_dec/spudec.h
index 1e7d80596..3b862c545 100644
--- a/src/spu_dec/spudec.h
+++ b/src/spu_dec/spudec.h
@@ -26,7 +26,7 @@
#define __SPU_H__
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <inttypes.h>
diff --git a/src/spu_dec/sputext_decoder.c b/src/spu_dec/sputext_decoder.c
index e86ee76e3..dee14d02a 100644
--- a/src/spu_dec/sputext_decoder.c
+++ b/src/spu_dec/sputext_decoder.c
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/src/spu_dec/xine_cc_decoder.c b/src/spu_dec/xine_cc_decoder.c
index 62193758b..d9a425d60 100644
--- a/src/spu_dec/xine_cc_decoder.c
+++ b/src/spu_dec/xine_cc_decoder.c
@@ -20,6 +20,10 @@
* closed caption spu decoder. receive data by events.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/src/video_dec/bitplane.c b/src/video_dec/bitplane.c
index 811fe4dcf..fa9f0ffba 100644
--- a/src/video_dec/bitplane.c
+++ b/src/video_dec/bitplane.c
@@ -29,6 +29,10 @@
* - untested (found no testfiles) IFF-ANIM OPT 3, 4 and 6
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/video_dec/foovideo.c b/src/video_dec/foovideo.c
index 653f7eb47..61a4b1e40 100644
--- a/src/video_dec/foovideo.c
+++ b/src/video_dec/foovideo.c
@@ -24,6 +24,10 @@
* frame when the frames are played in succession.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/video_dec/gdkpixbuf.c b/src/video_dec/gdkpixbuf.c
index 01378acbc..9eea449a5 100644
--- a/src/video_dec/gdkpixbuf.c
+++ b/src/video_dec/gdkpixbuf.c
@@ -20,6 +20,11 @@
* a gdk-pixbuf-based image video decoder
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+
#include <stdlib.h>
#include <string.h>
diff --git a/src/video_dec/image.c b/src/video_dec/image.c
index 3413bb96f..14ca6fefe 100644
--- a/src/video_dec/image.c
+++ b/src/video_dec/image.c
@@ -20,6 +20,10 @@
* a image video decoder
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdlib.h>
#include <string.h>
diff --git a/src/video_dec/libmpeg2/slice_xvmc_vld.c b/src/video_dec/libmpeg2/slice_xvmc_vld.c
index 3606cf66b..60fa8b4f8 100644
--- a/src/video_dec/libmpeg2/slice_xvmc_vld.c
+++ b/src/video_dec/libmpeg2/slice_xvmc_vld.c
@@ -17,6 +17,10 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <xine/xine_internal.h>
#include <xine/video_out.h>
#include "mpeg2.h"
diff --git a/src/video_dec/libmpeg2/xine_mpeg2_decoder.c b/src/video_dec/libmpeg2/xine_mpeg2_decoder.c
index 0419efa61..d72e610ab 100644
--- a/src/video_dec/libmpeg2/xine_mpeg2_decoder.c
+++ b/src/video_dec/libmpeg2/xine_mpeg2_decoder.c
@@ -20,6 +20,10 @@
* stuff needed to turn libmpeg2 into a xine decoder plugin
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdlib.h>
#include <string.h>
diff --git a/src/video_dec/libmpeg2new/include/Makefile.am b/src/video_dec/libmpeg2new/include/Makefile.am
index 302d01cb1..781e6d0b5 100644
--- a/src/video_dec/libmpeg2new/include/Makefile.am
+++ b/src/video_dec/libmpeg2new/include/Makefile.am
@@ -1,3 +1 @@
-pkginclude_HEADERS = mpeg2.h mpeg2convert.h
-
-EXTRA_DIST = video_out.h mmx.h alpha_asm.h vis.h attributes.h tendra.h
+EXTRA_DIST = video_out.h mmx.h alpha_asm.h vis.h attributes.h tendra.h mpeg2.h mpeg2convert.h
diff --git a/src/video_dec/libmpeg2new/libmpeg2/motion_comp_vis.c b/src/video_dec/libmpeg2new/libmpeg2/motion_comp_vis.c
index e724d28a2..f4e1724bf 100644
--- a/src/video_dec/libmpeg2new/libmpeg2/motion_comp_vis.c
+++ b/src/video_dec/libmpeg2new/libmpeg2/motion_comp_vis.c
@@ -22,7 +22,7 @@
#include "config.h"
-#ifdef ARCH_SPARC
+#if defined(ARCH_SPARC) && defined(ENABLE_VIS)
#include <inttypes.h>
@@ -2058,4 +2058,4 @@ static void MC_avg_xy_8_vis (uint8_t * dest, const uint8_t * _ref,
MPEG2_MC_EXTERN(vis);
-#endif /* !(ARCH_SPARC) */
+#endif /* defined(ARCH_SPARC) && defined(ENABLE_VIS) */
diff --git a/src/video_dec/libmpeg2new/xine_mpeg2new_decoder.c b/src/video_dec/libmpeg2new/xine_mpeg2new_decoder.c
index 3e42a161d..bcb0384fd 100644
--- a/src/video_dec/libmpeg2new/xine_mpeg2new_decoder.c
+++ b/src/video_dec/libmpeg2new/xine_mpeg2new_decoder.c
@@ -20,6 +20,10 @@
* stuff needed to turn libmpeg2 into a xine decoder plugin
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdlib.h>
#include <string.h>
diff --git a/src/video_dec/rgb.c b/src/video_dec/rgb.c
index 9f3dd279c..f661bd63e 100644
--- a/src/video_dec/rgb.c
+++ b/src/video_dec/rgb.c
@@ -31,6 +31,10 @@
* indicated by a negative height parameter.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/video_dec/yuv.c b/src/video_dec/yuv.c
index 323a1648f..bfad8b713 100644
--- a/src/video_dec/yuv.c
+++ b/src/video_dec/yuv.c
@@ -22,6 +22,10 @@
* a way that xine can display them.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c
index ad0150bbd..0c6294f51 100644
--- a/src/video_out/video_out_directx.c
+++ b/src/video_out/video_out_directx.c
@@ -21,6 +21,10 @@
* by Matthew Grooms <elon@altavista.com>
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
typedef unsigned char boolean;
#include <windows.h>
diff --git a/src/xine-engine/alphablend.c b/src/xine-engine/alphablend.c
index 8eff8da8e..dd8c4987b 100644
--- a/src/xine-engine/alphablend.c
+++ b/src/xine-engine/alphablend.c
@@ -23,6 +23,10 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
/*
#define LOG_BLEND_YUV
#define LOG_BLEND_RGB16
diff --git a/src/xine-engine/broadcaster.c b/src/xine-engine/broadcaster.c
index 5fcc2ca29..8be3dda5d 100644
--- a/src/xine-engine/broadcaster.c
+++ b/src/xine-engine/broadcaster.c
@@ -32,6 +32,10 @@
* 'xine -V none -A none'
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/src/xine-engine/demux.c b/src/xine-engine/demux.c
index 59de9381e..ed5abb247 100644
--- a/src/xine-engine/demux.c
+++ b/src/xine-engine/demux.c
@@ -21,6 +21,9 @@
* hide some xine engine details from demuxers and reduce code duplication
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#include <stdio.h>
#include <string.h>
diff --git a/src/xine-engine/refcounter.c b/src/xine-engine/refcounter.c
index 8bf04d2a7..2c1b5a786 100644
--- a/src/xine-engine/refcounter.c
+++ b/src/xine-engine/refcounter.c
@@ -17,6 +17,11 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#define LOG_MODULE "refcounter"
#define LOG_VERBOSE
/*
diff --git a/src/xine-engine/video_overlay.c b/src/xine-engine/video_overlay.c
index b551ac53c..cb9aa96fa 100644
--- a/src/xine-engine/video_overlay.c
+++ b/src/xine-engine/video_overlay.c
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/src/xine-engine/vo_scale.c b/src/xine-engine/vo_scale.c
index 567b3984a..7c5cfd38c 100644
--- a/src/xine-engine/vo_scale.c
+++ b/src/xine-engine/vo_scale.c
@@ -22,6 +22,10 @@
* Takes into account aspect ratio correction and zooming.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
#include <string.h>
#include <math.h>
diff --git a/src/xine-utils/xine_buffer.c b/src/xine-utils/xine_buffer.c
index 8dea081ec..4518d8f05 100644
--- a/src/xine-utils/xine_buffer.c
+++ b/src/xine-utils/xine_buffer.c
@@ -47,6 +47,10 @@
* (eg during reallocation). The user must respect that.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/src/xine-utils/xmllexer.c b/src/xine-utils/xmllexer.c
index b2be2a5e5..a535b7aca 100644
--- a/src/xine-utils/xmllexer.c
+++ b/src/xine-utils/xmllexer.c
@@ -25,6 +25,10 @@
#define LOG
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#ifdef XINE_COMPILE
#include <xine/xineutils.h>
#else
diff --git a/src/xine-utils/xmlparser.c b/src/xine-utils/xmlparser.c
index d8ecb251c..c5acf8739 100644
--- a/src/xine-utils/xmlparser.c
+++ b/src/xine-utils/xmlparser.c
@@ -19,6 +19,10 @@
* Floor, Boston, MA 02110, USA
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#ifdef XINE_COMPILE
# include "config.h"
#endif