diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-02-10 16:46:50 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-02-10 16:46:50 +0100 |
| commit | 1119f6ee4103990ccc55d521be08bdce10737c8e (patch) | |
| tree | d2b9a31d43d6a1f832951a9c984127e27622211a /ext/mplex | |
| parent | 9fcfa6046d0e8e8ec89c32d7091b747088265d70 (diff) | |
| parent | 1cbd755a2cd45531076c7b19ef194b77d5575cb0 (diff) | |
| download | gstreamer-plugins-bad-1119f6ee4103990ccc55d521be08bdce10737c8e.tar.gz | |
Merge branch 'master' into 0.11
Conflicts:
ext/chromaprint/gstchromaprint.c
ext/mpeg2enc/Makefile.am
ext/voaacenc/gstvoaacenc.c
gst/dvbsuboverlay/gstdvbsuboverlay.c
gst/mpegtsdemux/mpegtsbase.c
gst/sdp/gstsdpdemux.c
gst/videoparsers/gsth264parse.c
sys/d3dvideosink/d3dvideosink.c
tests/examples/camerabin/gst-camera-perf.c
tests/examples/camerabin/gst-camerabin-test.c
tests/examples/camerabin2/gst-camerabin2-test.c
tests/examples/mxf/mxfdemux-structure.c
tests/examples/scaletempo/demo-main.c
Diffstat (limited to 'ext/mplex')
| -rw-r--r-- | ext/mplex/Makefile.am | 2 | ||||
| -rw-r--r-- | ext/mplex/gstmplex.cc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ext/mplex/Makefile.am b/ext/mplex/Makefile.am index 86ff2f215..741b0d893 100644 --- a/ext/mplex/Makefile.am +++ b/ext/mplex/Makefile.am @@ -7,7 +7,7 @@ libgstmplex_la_SOURCES = \ gstmplexoutputstream.cc libgstmplex_la_CXXFLAGS = \ - $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(MPLEX_CFLAGS) + $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(MPLEX_CFLAGS) libgstmplex_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(MPLEX_LIBS) libgstmplex_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(MPLEX_LDFLAGS) diff --git a/ext/mplex/gstmplex.cc b/ext/mplex/gstmplex.cc index 4a492976b..2c9328d17 100644 --- a/ext/mplex/gstmplex.cc +++ b/ext/mplex/gstmplex.cc @@ -53,6 +53,7 @@ #include <string.h> +#include <gst/glib-compat-private.h> #include "gstmplex.hh" #include "gstmplexoutputstream.hh" #include "gstmplexibitstream.hh" |