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/cog | |
| 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/cog')
| -rw-r--r-- | ext/cog/Makefile.am | 1 | ||||
| -rw-r--r-- | ext/cog/gstcogmse.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/ext/cog/Makefile.am b/ext/cog/Makefile.am index 81e0f15e1..bbed6fe0e 100644 --- a/ext/cog/Makefile.am +++ b/ext/cog/Makefile.am @@ -5,6 +5,7 @@ include $(top_srcdir)/common/orc.mak libgstcog_la_CFLAGS = \ -DCOG_ENABLE_UNSTABLE_API \ + $(GST_PLUGINS_BAD_CFLAGS) \ -I$(srcdir)/.. \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_CFLAGS) \ diff --git a/ext/cog/gstcogmse.c b/ext/cog/gstcogmse.c index f4ac3fb58..f73a3b8d4 100644 --- a/ext/cog/gstcogmse.c +++ b/ext/cog/gstcogmse.c @@ -23,6 +23,7 @@ #endif #include <gst/gst.h> +#include <gst/glib-compat-private.h> #include <gst/video/video.h> #include <string.h> #include <cog/cogframe.h> |