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/mpeg2enc | |
| 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/mpeg2enc')
| -rw-r--r-- | ext/mpeg2enc/Makefile.am | 3 | ||||
| -rw-r--r-- | ext/mpeg2enc/gstmpeg2enc.cc | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/mpeg2enc/Makefile.am b/ext/mpeg2enc/Makefile.am index 719a161b7..9b79185ff 100644 --- a/ext/mpeg2enc/Makefile.am +++ b/ext/mpeg2enc/Makefile.am @@ -8,8 +8,7 @@ libgstmpeg2enc_la_SOURCES = \ gstmpeg2encpicturereader.cc libgstmpeg2enc_la_CXXFLAGS = \ - $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ - $(GST_CXXFLAGS) $(MPEG2ENC_CFLAGS) + $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(MPEG2ENC_CFLAGS) libgstmpeg2enc_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \ $(GST_LIBS) $(MPEG2ENC_LIBS) diff --git a/ext/mpeg2enc/gstmpeg2enc.cc b/ext/mpeg2enc/gstmpeg2enc.cc index e8f16aa21..4e8eaaccd 100644 --- a/ext/mpeg2enc/gstmpeg2enc.cc +++ b/ext/mpeg2enc/gstmpeg2enc.cc @@ -57,6 +57,7 @@ #include "config.h" #endif +#include <gst/glib-compat-private.h> #include "gstmpeg2enc.hh" GST_DEBUG_CATEGORY (mpeg2enc_debug); |