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

diff --git a/ext/soundtouch/gstbpmdetect.cc b/ext/soundtouch/gstbpmdetect.cc
index 56ba087cd91b269baa2a55bf1e4b02177ce63fbb..710ba86665b84c386287b39b16b68ed7908976d3 100644 (file)
--- 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 3990b9d48f8a2a6a08740f90937fc64f0db6c60c..2ad0509b5f28b654d550586837b431c57d646d9c 100644 (file)
--- 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>

diff --git a/gst-libs/gst/signalprocessor/gstsignalprocessor.c b/gst-libs/gst/signalprocessor/gstsignalprocessor.c
index 9b3e3ab7f2709eaa09a6f048e9a03b7b6d493590..80b366cf9285308097caadabec29676ced7b59eb 100644 (file)
--- a/gst-libs/gst/signalprocessor/gstsignalprocessor.c
+++ b/gst-libs/gst/signalprocessor/gstsignalprocessor.c
@@ -37,13 +37,13 @@
  *    the buffer
  */
 
-#include <stdlib.h>
-#include <string.h>
-
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
 
+#include <stdlib.h>
+#include <string.h>
+
 #include <gst/audio/audio.h>
 #include "gstsignalprocessor.h"
 

diff --git a/gst/audioparsers/gstaacparse.c b/gst/audioparsers/gstaacparse.c
index 0debf38eaa8d65c241533862f150e347da2ab73d..db63c5a515de579095302c5b718805cf86084a01 100644 (file)
--- a/gst/audioparsers/gstaacparse.c
+++ b/gst/audioparsers/gstaacparse.c
@@ -45,12 +45,12 @@
  * </refsect2>
  */
 
-#include <string.h>
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "gstaacparse.h"
 
 

diff --git a/gst/audioparsers/gstamrparse.c b/gst/audioparsers/gstamrparse.c
index 0f1896a448bd69187075789b3e9b807770153136..0266ee875a7f02876cd44dc10106c9dc7c717a71 100644 (file)
--- a/gst/audioparsers/gstamrparse.c
+++ b/gst/audioparsers/gstamrparse.c
@@ -39,12 +39,12 @@
  * </refsect2>
  */
 
-#include <string.h>
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "gstamrparse.h"
 
 

diff --git a/gst/h264parse/gsth264parse.c b/gst/h264parse/gsth264parse.c
index 4d49417836b676e3a21fea68bc8b4722fa345ec9..962357b699676cc580e0f4ff2285e05944aa77c6 100644 (file)
--- a/gst/h264parse/gsth264parse.c
+++ b/gst/h264parse/gsth264parse.c
@@ -24,13 +24,13 @@
  */
 
 
-#include <stdlib.h>
-#include <string.h>
-
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
 
+#include <stdlib.h>
+#include <string.h>
+
 #include "gsth264parse.h"
 
 static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",

diff --git a/gst/mpegdemux/Makefile.am b/gst/mpegdemux/Makefile.am
index 5e76dcc25093a5be552b852ec3c2bb81d5df8189..a3e56fc416178847f0e590b556964bd11ea452d4 100644 (file)
--- a/gst/mpegdemux/Makefile.am
+++ b/gst/mpegdemux/Makefile.am
@@ -17,7 +17,7 @@ libgstmpegdemux_la_CFLAGS = \
        $(GST_PLUGINS_BASE_CFLAGS) \
        $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LIBOIL_CFLAGS)
 libgstmpegdemux_la_LIBADD = \
-       $(GST_PLUGINS_BASE_CFLAGS) -lgsttag-$(GST_MAJORMINOR) \
+       $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \
        $(GST_BASE_LIBS) $(GST_LIBS) $(LIBOIL_LIBS)
 libgstmpegdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstmpegdemux_la_LIBTOOLFLAGS = --tag=disable-static