diff options
56 files changed, 95 insertions, 34 deletions
diff --git a/ext/aalib/gstaasink.c b/ext/aalib/gstaasink.c index 7aa8fa51..4a7d8a40 100644 --- a/ext/aalib/gstaasink.c +++ b/ext/aalib/gstaasink.c @@ -20,7 +20,6 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include <config.h> #include <string.h> #include <sys/time.h> diff --git a/ext/flac/gstflac.c b/ext/flac/gstflac.c index eeed9c08..6b399eff 100644 --- a/ext/flac/gstflac.c +++ b/ext/flac/gstflac.c @@ -17,6 +17,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "gstflacenc.h" #include "gstflacdec.h" diff --git a/ext/flac/gstflacdec.h b/ext/flac/gstflacdec.h index 67742ac6..b5a1e177 100644 --- a/ext/flac/gstflacdec.h +++ b/ext/flac/gstflacdec.h @@ -22,7 +22,6 @@ #define __FLACDEC_H__ -#include <config.h> #include <gst/gst.h> #include <gst/bytestream/bytestream.h> diff --git a/ext/flac/gstflacenc.h b/ext/flac/gstflacenc.h index 9c724b9c..ac3254b0 100644 --- a/ext/flac/gstflacenc.h +++ b/ext/flac/gstflacenc.h @@ -22,7 +22,6 @@ #define __FLACENC_H__ -#include <config.h> #include <gst/gst.h> #include <FLAC/all.h> diff --git a/ext/ladspa/gstladspa.h b/ext/ladspa/gstladspa.h index 89a039e9..b588ffa4 100644 --- a/ext/ladspa/gstladspa.h +++ b/ext/ladspa/gstladspa.h @@ -24,7 +24,6 @@ #define __GST_LADSPA_H__ -#include <config.h> #include <gst/gst.h> #include <gst/bytestream/bytestream.h> diff --git a/ext/ladspa/load.c b/ext/ladspa/load.c index c912106f..bf52eb1f 100644 --- a/ext/ladspa/load.c +++ b/ext/ladspa/load.c @@ -5,6 +5,10 @@ /*****************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <dlfcn.h> #include <stdio.h> #include <stdlib.h> diff --git a/ext/ladspa/search.c b/ext/ladspa/search.c index aac4381b..08b28d12 100644 --- a/ext/ladspa/search.c +++ b/ext/ladspa/search.c @@ -5,6 +5,10 @@ /*****************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <dirent.h> #include <dlfcn.h> #include <stdio.h> diff --git a/ext/mikmod/drv_gst.c b/ext/mikmod/drv_gst.c index 122de610..83d475ba 100644 --- a/ext/mikmod/drv_gst.c +++ b/ext/mikmod/drv_gst.c @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <stdlib.h> #include "gstmikmod.h" diff --git a/ext/mikmod/gstmikmod.h b/ext/mikmod/gstmikmod.h index 686c484a..9d5db8a5 100644 --- a/ext/mikmod/gstmikmod.h +++ b/ext/mikmod/gstmikmod.h @@ -21,7 +21,6 @@ #ifndef __GST_MIKMOD_H__ #define __GST_MIKMOD_H__ -#include <config.h> #include <mikmod.h> #include <gst/gst.h> diff --git a/ext/mikmod/mikmod_reader.c b/ext/mikmod/mikmod_reader.c index b850f502..38b8402c 100644 --- a/ext/mikmod/mikmod_reader.c +++ b/ext/mikmod/mikmod_reader.c @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <unistd.h> #include <string.h> diff --git a/ext/mikmod/mikmod_types.c b/ext/mikmod/mikmod_types.c index 8c4045d8..f583d082 100644 --- a/ext/mikmod/mikmod_types.c +++ b/ext/mikmod/mikmod_types.c @@ -16,7 +16,11 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ - + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <gst/gst.h> #include "mikmod_types.h" #include <string.h> /* memcmp */ diff --git a/ext/pango/gsttimeoverlay.c b/ext/pango/gsttimeoverlay.c index dba75612..6e1b7484 100644 --- a/ext/pango/gsttimeoverlay.c +++ b/ext/pango/gsttimeoverlay.c @@ -27,6 +27,9 @@ * Copyright (C) 2001 Sun Microsystems */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif /*#define DEBUG_ENABLED */ #include <gsttimeoverlay.h> diff --git a/ext/pango/gsttimeoverlay.h b/ext/pango/gsttimeoverlay.h index bc337153..505f8f04 100644 --- a/ext/pango/gsttimeoverlay.h +++ b/ext/pango/gsttimeoverlay.h @@ -22,7 +22,6 @@ #define __GST_TIMEOVERLAY_H__ -#include <config.h> #include <gst/gst.h> #include <pango/pango.h> diff --git a/ext/raw1394/gstdv1394src.h b/ext/raw1394/gstdv1394src.h index 8de7c54d..72d0e192 100644 --- a/ext/raw1394/gstdv1394src.h +++ b/ext/raw1394/gstdv1394src.h @@ -22,7 +22,6 @@ #define __GST_GST1394_H__ -#include <config.h> #include <gst/gst.h> #include <libraw1394/raw1394.h> diff --git a/ext/speex/gstspeexdec.h b/ext/speex/gstspeexdec.h index c6fe3e96..c679dc18 100644 --- a/ext/speex/gstspeexdec.h +++ b/ext/speex/gstspeexdec.h @@ -22,7 +22,6 @@ #define __GST_SPEEXDEC_H__ -#include <config.h> #include <gst/gst.h> #include <speex.h> diff --git a/ext/speex/gstspeexenc.h b/ext/speex/gstspeexenc.h index a7fa772c..4677f6a1 100644 --- a/ext/speex/gstspeexenc.h +++ b/ext/speex/gstspeexenc.h @@ -22,7 +22,6 @@ #define __GST_SPEEXENC_H__ -#include <config.h> #include <gst/gst.h> #include <speex.h> diff --git a/gst/auparse/gstauparse.h b/gst/auparse/gstauparse.h index 7b529c20..d6e5a082 100644 --- a/gst/auparse/gstauparse.h +++ b/gst/auparse/gstauparse.h @@ -22,7 +22,6 @@ #define __GST_AUPARSE_H__ -#include <config.h> #include <gst/gst.h> diff --git a/gst/avi/gstavidemux.h b/gst/avi/gstavidemux.h index d1c1d582..a9334283 100644 --- a/gst/avi/gstavidemux.h +++ b/gst/avi/gstavidemux.h @@ -22,7 +22,6 @@ #define __GST_AVI_DEMUX_H__ -#include <config.h> #include <gst/gst.h> #include <gst/bytestream/bytestream.h> #include <gst/riff/riff.h> diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c index 8c8a4eaf..ce496932 100644 --- a/gst/avi/gstavimux.c +++ b/gst/avi/gstavimux.c @@ -28,7 +28,6 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include <config.h> #include <stdlib.h> #include <string.h> @@ -170,6 +169,7 @@ GST_PAD_TEMPLATE_FACTORY (audio_sink_factory, GST_CAPS_NEW ( "avimux_sink_audio_mpeg", "audio/mpeg", + "mpegversion", GST_PROPS_INT (1), "layer", GST_PROPS_INT_RANGE (1, 3), "rate", GST_PROPS_INT_RANGE (1000, 96000), "channels", GST_PROPS_INT_RANGE (1, 2) diff --git a/gst/cutter/gstcutter.h b/gst/cutter/gstcutter.h index 124cd0f4..84166636 100644 --- a/gst/cutter/gstcutter.h +++ b/gst/cutter/gstcutter.h @@ -22,7 +22,6 @@ #define __GST_CUTTER_H__ -#include <config.h> #include <gst/gst.h> /* #include <gst/meta/audioraw.h> */ diff --git a/gst/flx/flx_color.c b/gst/flx/flx_color.c index 8a84d2b0..b64c90c4 100644 --- a/gst/flx/flx_color.c +++ b/gst/flx/flx_color.c @@ -17,10 +17,13 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <string.h> #include <gst/gst.h> - #include "flx_color.h" FlxColorSpaceConverter * diff --git a/gst/goom/filters.c b/gst/goom/filters.c index 8fdabc18..5d74b622 100644 --- a/gst/goom/filters.c +++ b/gst/goom/filters.c @@ -12,6 +12,10 @@ /*#define _DEBUG_PIXEL; */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "filters.h" #include "graphic.h" #include "goom_tools.h" diff --git a/gst/goom/graphic.c b/gst/goom/graphic.c index 4223c67b..cd24d49f 100644 --- a/gst/goom/graphic.c +++ b/gst/goom/graphic.c @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "graphic.h" const Color BLACK = {0,0,0} ; diff --git a/gst/goom/gstgoom.c b/gst/goom/gstgoom.c index a634633a..bb048401 100644 --- a/gst/goom/gstgoom.c +++ b/gst/goom/gstgoom.c @@ -20,7 +20,7 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include <config.h> + #include <gst/gst.h> #include <gst/video/video.h> #include "goom_core.h" diff --git a/gst/goom/lines.c b/gst/goom/lines.c index cadf9203..131fd002 100644 --- a/gst/goom/lines.c +++ b/gst/goom/lines.c @@ -7,6 +7,10 @@ * */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "lines.h" #include <math.h> diff --git a/gst/law/alaw-decode.h b/gst/law/alaw-decode.h index 88c39adb..aa3a418c 100644 --- a/gst/law/alaw-decode.h +++ b/gst/law/alaw-decode.h @@ -22,7 +22,6 @@ #define __GST_ALAWDECODE_H__ -#include <config.h> #include <gst/gst.h> /* #include <gst/meta/audioraw.h> */ diff --git a/gst/law/alaw-encode.h b/gst/law/alaw-encode.h index a0eac9f7..e0801036 100644 --- a/gst/law/alaw-encode.h +++ b/gst/law/alaw-encode.h @@ -22,7 +22,6 @@ #define __GST_ALAWENCODE_H__ -#include <config.h> #include <gst/gst.h> /* #include <gst/meta/audioraw.h> */ diff --git a/gst/law/mulaw-conversion.c b/gst/law/mulaw-conversion.c index ad3fcce6..e921fb88 100644 --- a/gst/law/mulaw-conversion.c +++ b/gst/law/mulaw-conversion.c @@ -19,6 +19,10 @@ * Output: 8 bit ulaw sample */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <glib.h> #define ZEROTRAP /* turn on the trap as per the MIL-STD */ diff --git a/gst/law/mulaw-decode.h b/gst/law/mulaw-decode.h index dc3045e2..d34c8c06 100644 --- a/gst/law/mulaw-decode.h +++ b/gst/law/mulaw-decode.h @@ -22,7 +22,6 @@ #define __GST_MULAWDECODE_H__ -#include <config.h> #include <gst/gst.h> /* #include <gst/meta/audioraw.h> */ diff --git a/gst/law/mulaw-encode.h b/gst/law/mulaw-encode.h index b6018887..6d99759b 100644 --- a/gst/law/mulaw-encode.h +++ b/gst/law/mulaw-encode.h @@ -22,7 +22,6 @@ #define __GST_MULAWENCODE_H__ -#include <config.h> #include <gst/gst.h> /* #include <gst/meta/audioraw.h> */ diff --git a/gst/level/demo.c b/gst/level/demo.c index 542e2d67..98781b46 100644 --- a/gst/level/demo.c +++ b/gst/level/demo.c @@ -21,6 +21,10 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <gst/gst.h> #include <gtk/gtk.h> diff --git a/gst/level/gstlevel.h b/gst/level/gstlevel.h index 37143275..59427c7d 100644 --- a/gst/level/gstlevel.h +++ b/gst/level/gstlevel.h @@ -26,7 +26,6 @@ #define __GST_LEVEL_H__ -#include <config.h> #include <gst/gst.h> #include "gstlevel-marshal.h" diff --git a/gst/level/plot.c b/gst/level/plot.c index 4e770326..27ecd01a 100644 --- a/gst/level/plot.c +++ b/gst/level/plot.c @@ -21,6 +21,10 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <gst/gst.h> #include <gtk/gtk.h> diff --git a/gst/median/gstmedian.h b/gst/median/gstmedian.h index 26a2258f..c22b80d1 100644 --- a/gst/median/gstmedian.h +++ b/gst/median/gstmedian.h @@ -22,7 +22,6 @@ #define __GST_MEDIAN_H__ -#include <config.h> #include <gst/gst.h> diff --git a/gst/monoscope/convolve.c b/gst/monoscope/convolve.c index aefffa3e..b707621b 100644 --- a/gst/monoscope/convolve.c +++ b/gst/monoscope/convolve.c @@ -55,6 +55,10 @@ * convolution", or "combine these three length 2^n outputs into one * 2^{n+1} output." */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <stdlib.h> #include "convolve.h" diff --git a/gst/monoscope/gstmonoscope.c b/gst/monoscope/gstmonoscope.c index b4169c2f..27e3039a 100644 --- a/gst/monoscope/gstmonoscope.c +++ b/gst/monoscope/gstmonoscope.c @@ -20,7 +20,7 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include <config.h> + #include <gst/gst.h> #include <gst/video/video.h> #include "monoscope.h" diff --git a/gst/monoscope/monoscope.c b/gst/monoscope/monoscope.c index 383581ea..eb0e728a 100644 --- a/gst/monoscope/monoscope.c +++ b/gst/monoscope/monoscope.c @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "monoscope.h" #include <string.h> diff --git a/gst/smpte/barboxwipes.c b/gst/smpte/barboxwipes.c index e1cab9d0..a490f632 100644 --- a/gst/smpte/barboxwipes.c +++ b/gst/smpte/barboxwipes.c @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "paint.h" #include "gstmask.h" diff --git a/gst/smpte/gstmask.c b/gst/smpte/gstmask.c index 6430f420..13c79b34 100644 --- a/gst/smpte/gstmask.c +++ b/gst/smpte/gstmask.c @@ -17,6 +17,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "gstmask.h" #include "paint.h" diff --git a/gst/smpte/paint.c b/gst/smpte/paint.c index e912dfdf..dae3c6f1 100644 --- a/gst/smpte/paint.c +++ b/gst/smpte/paint.c @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <math.h> #include <stdlib.h> #include "paint.h" diff --git a/gst/udp/gstudp.c b/gst/udp/gstudp.c index f74b4b2d..d4d90bc2 100644 --- a/gst/udp/gstudp.c +++ b/gst/udp/gstudp.c @@ -17,6 +17,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "gstudpsrc.h" #include "gstudpsink.h" diff --git a/gst/udp/gstudpsink.h b/gst/udp/gstudpsink.h index fe3a9f87..f49b4efe 100644 --- a/gst/udp/gstudpsink.h +++ b/gst/udp/gstudpsink.h @@ -22,7 +22,6 @@ #define __GST_UDPSINK_H__ -#include <config.h> #include <gst/gst.h> #ifdef __cplusplus diff --git a/gst/udp/gstudpsrc.h b/gst/udp/gstudpsrc.h index 3311db7f..f16673df 100644 --- a/gst/udp/gstudpsrc.h +++ b/gst/udp/gstudpsrc.h @@ -21,7 +21,6 @@ #ifndef __GST_UDPSRC_H__ #define __GST_UDPSRC_H__ -#include <config.h> #include <gst/gst.h> #ifdef __cplusplus diff --git a/gst/videofilter/gstvideobalance.c b/gst/videofilter/gstvideobalance.c index 41fd93f6..498e1e5a 100644 --- a/gst/videofilter/gstvideobalance.c +++ b/gst/videofilter/gstvideobalance.c @@ -18,6 +18,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif /*#define DEBUG_ENABLED */ #include <gstvideobalance.h> diff --git a/gst/videofilter/gstvideobalance.h b/gst/videofilter/gstvideobalance.h index 75bc1125..5c8b3cf4 100644 --- a/gst/videofilter/gstvideobalance.h +++ b/gst/videofilter/gstvideobalance.h @@ -22,7 +22,6 @@ #define __GST_VIDEOBALANCE_H__ -#include <config.h> #include <gst/gst.h> #include "gstvideofilter.h" diff --git a/gst/videofilter/gstvideofilter.c b/gst/videofilter/gstvideofilter.c index a7446887..3eb92f9a 100644 --- a/gst/videofilter/gstvideofilter.c +++ b/gst/videofilter/gstvideofilter.c @@ -18,6 +18,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif /*#define DEBUG_ENABLED */ #include <gstvideofilter.h> diff --git a/gst/videofilter/gstvideofilter.h b/gst/videofilter/gstvideofilter.h index 78678350..fa708328 100644 --- a/gst/videofilter/gstvideofilter.h +++ b/gst/videofilter/gstvideofilter.h @@ -22,7 +22,6 @@ #define __GST_VIDEOFILTER_H__ -#include <config.h> #include <gst/gst.h> diff --git a/gst/videofilter/gstvideoflip.h b/gst/videofilter/gstvideoflip.h index 9260a8c8..b6aad296 100644 --- a/gst/videofilter/gstvideoflip.h +++ b/gst/videofilter/gstvideoflip.h @@ -22,7 +22,6 @@ #define __GST_VIDEOFLIP_H__ -#include <config.h> #include <gst/gst.h> #include "gstvideofilter.h" diff --git a/gst/videofilter/gstvideotemplate.c b/gst/videofilter/gstvideotemplate.c index b37fa71e..cc06b942 100644 --- a/gst/videofilter/gstvideotemplate.c +++ b/gst/videofilter/gstvideotemplate.c @@ -18,6 +18,9 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif /*#define DEBUG_ENABLED */ #include <gstvideotemplate.h> diff --git a/gst/videofilter/gstvideotemplate.h b/gst/videofilter/gstvideotemplate.h index 625ac1f3..1a2c0a2d 100644 --- a/gst/videofilter/gstvideotemplate.h +++ b/gst/videofilter/gstvideotemplate.h @@ -22,7 +22,6 @@ #define __GST_VIDEOTEMPLATE_H__ -#include <config.h> #include <gst/gst.h> #include "gstvideofilter.h" diff --git a/gst/videoflip/gstvideoflip.h b/gst/videoflip/gstvideoflip.h index e3463e5e..b14b0bd3 100644 --- a/gst/videoflip/gstvideoflip.h +++ b/gst/videoflip/gstvideoflip.h @@ -22,7 +22,6 @@ #define __GST_VIDEOFLIP_H__ -#include <config.h> #include <gst/gst.h> diff --git a/gst/videoflip/videoflip.c b/gst/videoflip/videoflip.c index b5ab9e07..f108ea62 100644 --- a/gst/videoflip/videoflip.c +++ b/gst/videoflip/videoflip.c @@ -21,13 +21,13 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif + #include <gst/gst.h> #include <stdlib.h> #include <math.h> #include <videoflip.h> #include <string.h> -#include "config.h" #include "gstvideoflip.h" static void gst_videoflip_planar411 (GstVideoflip *scale, unsigned char *dest, unsigned char *src); diff --git a/gst/wavenc/gstwavenc.h b/gst/wavenc/gstwavenc.h index a379155a..6c3f56f0 100644 --- a/gst/wavenc/gstwavenc.h +++ b/gst/wavenc/gstwavenc.h @@ -22,7 +22,6 @@ #define __GST_WAVENC_H__ -#include <config.h> #include <gst/gst.h> G_BEGIN_DECLS diff --git a/gst/wavparse/gstwavparse.h b/gst/wavparse/gstwavparse.h index 485c7554..d45cde51 100644 --- a/gst/wavparse/gstwavparse.h +++ b/gst/wavparse/gstwavparse.h @@ -22,7 +22,6 @@ #define __GST_WAVPARSE_H__ -#include <config.h> #include <gst/gst.h> #include <riff.h> #include <gst/bytestream/bytestream.h> diff --git a/sys/oss/gstossgst.h b/sys/oss/gstossgst.h index df0a8e15..d521ea04 100644 --- a/sys/oss/gstossgst.h +++ b/sys/oss/gstossgst.h @@ -25,7 +25,6 @@ #define __GST_OSSGST_H__ -#include <config.h> #include <gst/gst.h> #include <sys/types.h> diff --git a/sys/v4l2/v4l2src_calls.c b/sys/v4l2/v4l2src_calls.c index 521196cf..576b0c0b 100644 --- a/sys/v4l2/v4l2src_calls.c +++ b/sys/v4l2/v4l2src_calls.c @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <stdlib.h> #include <sys/types.h> #include <sys/stat.h> |