diff options
| author | Ðóñëàí Èæáóëàòîâ <lrn1986@gmail.com> | 2010-01-11 22:41:57 +0300 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2010-01-12 12:31:56 +0100 |
| commit | b3f0b029f3c3382cf7d63c22f144e3204c68b182 (patch) | |
| tree | 8a36f78f81d91c95a0e621141af491dd79ef3b4e /ext/soundtouch | |
| parent | d61abce8e42ea9dcd1b351d1e626ef5b7b8e13f8 (diff) | |
| download | gstreamer-plugins-bad-b3f0b029f3c3382cf7d63c22f144e3204c68b182.tar.gz | |
win32: Include config.h before anything else. Fix mpegdemux LIBADD
Because config.h defines __MSVCRT_VERSION__, which should be defined
before inclusion of any system header.
Also fixes mpegdemux Makefile.am LIBADD typo.
Fixes #606665
Diffstat (limited to 'ext/soundtouch')
| -rw-r--r-- | ext/soundtouch/gstbpmdetect.cc | 12 | ||||
| -rw-r--r-- | ext/soundtouch/gstpitch.cc | 11 |
2 files changed, 12 insertions, 11 deletions
diff --git a/ext/soundtouch/gstbpmdetect.cc b/ext/soundtouch/gstbpmdetect.cc index 56ba087cd..710ba8666 100644 --- a/ext/soundtouch/gstbpmdetect.cc +++ b/ext/soundtouch/gstbpmdetect.cc @@ -17,8 +17,10 @@ * Boston, MA 02111-1307, USA. */ -#define FLOAT_SAMPLES 1 -#include <soundtouch/BPMDetect.h> +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + /* FIXME: workaround for SoundTouch.h of version 1.3.1 defining those * variables while it shouldn't. */ #undef VERSION @@ -29,10 +31,8 @@ #undef PACKAGE_BUGREPORT #undef PACKAGE -/* FIXME: keep it here to avoid PACKAGE* redefinition warnings */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#define FLOAT_SAMPLES 1 +#include <soundtouch/BPMDetect.h> #include <gst/audio/audio.h> #include <gst/audio/gstaudiofilter.h> diff --git a/ext/soundtouch/gstpitch.cc b/ext/soundtouch/gstpitch.cc index 3990b9d48..2ad0509b5 100644 --- a/ext/soundtouch/gstpitch.cc +++ b/ext/soundtouch/gstpitch.cc @@ -17,8 +17,10 @@ * */ -#define FLOAT_SAMPLES 1 -#include <soundtouch/SoundTouch.h> +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + /* FIXME: workaround for SoundTouch.h of version 1.3.1 defining those * variables while it shouldn't. */ #undef VERSION @@ -29,9 +31,8 @@ #undef PACKAGE_BUGREPORT #undef PACKAGE -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#define FLOAT_SAMPLES 1 +#include <soundtouch/SoundTouch.h> #include <gst/gst.h> #include <gst/controller/gstcontroller.h> |