mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 11:45:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

win32: Include config.h before anything else. Fix mpegdemux LIBADD

Browse source 
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
This commit is contained in:
2010-01-11 22:41:57 +03:00 committed by Sebastian Dröge
parent d61abce8e4
commit b3f0b029f3
7 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ext/soundtouch/gstbpmdetect.cc
View file

@ -17,8 +17,10 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#define FLOAT_SAMPLES 1 #ifdef HAVE_CONFIG_H
#include <soundtouch/BPMDetect.h> #include "config.h"
#endif
/* FIXME: workaround for SoundTouch.h of version 1.3.1 defining those /* FIXME: workaround for SoundTouch.h of version 1.3.1 defining those
* variables while it shouldn't. */ * variables while it shouldn't. */
#undef VERSION #undef VERSION
@ -29,10 +31,8 @@
#undef PACKAGE_BUGREPORT #undef PACKAGE_BUGREPORT
#undef PACKAGE #undef PACKAGE
/* FIXME: keep it here to avoid PACKAGE* redefinition warnings */ #define FLOAT_SAMPLES 1
#ifdef HAVE_CONFIG_H #include <soundtouch/BPMDetect.h>
#include "config.h"
#endif
#include <gst/audio/audio.h> #include <gst/audio/audio.h>
#include <gst/audio/gstaudiofilter.h> #include <gst/audio/gstaudiofilter.h>

11
ext/soundtouch/gstpitch.cc
View file

@ -17,8 +17,10 @@
* *
*/ */
#define FLOAT_SAMPLES 1 #ifdef HAVE_CONFIG_H
#include <soundtouch/SoundTouch.h> # include <config.h>
#endif
/* FIXME: workaround for SoundTouch.h of version 1.3.1 defining those /* FIXME: workaround for SoundTouch.h of version 1.3.1 defining those
* variables while it shouldn't. */ * variables while it shouldn't. */
#undef VERSION #undef VERSION
@ -29,9 +31,8 @@
#undef PACKAGE_BUGREPORT #undef PACKAGE_BUGREPORT
#undef PACKAGE #undef PACKAGE
#ifdef HAVE_CONFIG_H #define FLOAT_SAMPLES 1
# include <config.h> #include <soundtouch/SoundTouch.h>
#endif
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/controller/gstcontroller.h> #include <gst/controller/gstcontroller.h>

6
gst-libs/gst/signalprocessor/gstsignalprocessor.c
View file

@ -37,13 +37,13 @@
* the buffer * the buffer
*/ */
#include <stdlib.h>
#include <string.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "config.h" # include "config.h"
#endif #endif
#include <stdlib.h>
#include <string.h>
#include <gst/audio/audio.h> #include <gst/audio/audio.h>
#include "gstsignalprocessor.h" #include "gstsignalprocessor.h"

4
gst/audioparsers/gstaacparse.c
View file

@ -45,12 +45,12 @@
* </refsect2> * </refsect2>
*/ */
#include <string.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif
#include <string.h>
#include "gstaacparse.h" #include "gstaacparse.h"

4
gst/audioparsers/gstamrparse.c
View file

@ -39,12 +39,12 @@
* </refsect2> * </refsect2>
*/ */
#include <string.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif
#include <string.h>
#include "gstamrparse.h" #include "gstamrparse.h"

6
gst/h264parse/gsth264parse.c
View file

@ -24,13 +24,13 @@
*/ */
#include <stdlib.h>
#include <string.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "config.h" # include "config.h"
#endif #endif
#include <stdlib.h>
#include <string.h>
#include "gsth264parse.h" #include "gsth264parse.h"
static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",

2
gst/mpegdemux/Makefile.am
View file

@ -17,7 +17,7 @@ libgstmpegdemux_la_CFLAGS = \
$(GST_PLUGINS_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LIBOIL_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LIBOIL_CFLAGS)
libgstmpegdemux_la_LIBADD = \ libgstmpegdemux_la_LIBADD = \
$(GST_PLUGINS_BASE_CFLAGS) -lgsttag-$(GST_MAJORMINOR) \ $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \
$(GST_BASE_LIBS) $(GST_LIBS) $(LIBOIL_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LIBOIL_LIBS)
libgstmpegdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstmpegdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstmpegdemux_la_LIBTOOLFLAGS = --tag=disable-static libgstmpegdemux_la_LIBTOOLFLAGS = --tag=disable-static