fix compile error with latest gst headers

A conflict between XDM and gst headers results in:

  cc1: warnings being treated as errors
  In file included from gstducati.h:32,
                   from gstducatividdec.h:25,
                   from gstducativp7dec.h:25,
                   from gstducativp7dec.c:40:
  /usr/include/dce/xdc/std.h:172: error: "restrict" redefined
  /usr/include/gstreamer-0.10/gst/gstmacros.h:44: note: this is the location of the previous definition

The solution is to ensure XDM headers are included first.

18 files changed, 3 insertions, 44 deletions

diff --git a/src/gstducati.c b/src/gstducati.c
index 75cef71..19ce3cd 100644
--- a/src/gstducati.c
+++ b/src/gstducati.c
@@ -21,8 +21,6 @@
 #  include <config.h>
 #endif
 
-#include <gst/gst.h>
-
 #include "gstducati.h"
 #include "gstducatih264dec.h"
 #include "gstducatimpeg4dec.h"
diff --git a/src/gstducati.h b/src/gstducati.h
index 3d50313..157d293 100644
--- a/src/gstducati.h
+++ b/src/gstducati.h
@@ -23,8 +23,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <gst/gst.h>
-
 #include <tiler.h>
 #include <tilermem.h>
 #include <memmgr.h>
@@ -33,6 +31,8 @@
 #include <ti/sdo/ce/Engine.h>
 #include <ti/sdo/ce/video3/viddec3.h>
 
+#include <gst/gst.h>
+
 G_BEGIN_DECLS
 
 GST_DEBUG_CATEGORY_EXTERN (gst_ducati_debug);
diff --git a/src/gstducatih264dec.c b/src/gstducatih264dec.c
index 8952208..eeb1d4c 100644
--- a/src/gstducatih264dec.c
+++ b/src/gstducatih264dec.c
@@ -34,9 +34,6 @@
 #  include <config.h>
 #endif
 
-#include <gst/gst.h>
-#include <gst/video/video.h>
-
 #include "gstducatih264dec.h"
 
 
diff --git a/src/gstducatih264dec.h b/src/gstducatih264dec.h
index ce0e636..a32c65d 100644
--- a/src/gstducatih264dec.h
+++ b/src/gstducatih264dec.h
@@ -20,8 +20,6 @@
 #ifndef __GST_DUCATIH264DEC_H__
 #define __GST_DUCATIH264DEC_H__
 
-#include <gst/gst.h>
-
 #include "gstducatividdec.h"
 
 #include <ti/sdo/codecs/h264dec/ih264vdec.h>
diff --git a/src/gstducatimpeg2dec.c b/src/gstducatimpeg2dec.c
index 3dcbe0f..eada5f4 100644
--- a/src/gstducatimpeg2dec.c
+++ b/src/gstducatimpeg2dec.c
@@ -34,9 +34,6 @@
 #  include <config.h>
 #endif
 
-#include <gst/gst.h>
-#include <gst/video/video.h>
-
 #include "gstducatimpeg2dec.h"
 
 GST_BOILERPLATE (GstDucatiMpeg2Dec, gst_ducati_mpeg2dec, GstDucatiVidDec,
diff --git a/src/gstducatimpeg2dec.h b/src/gstducatimpeg2dec.h
index cddd364..36b9c10 100644
--- a/src/gstducatimpeg2dec.h
+++ b/src/gstducatimpeg2dec.h
@@ -20,8 +20,6 @@
 #ifndef __GST_DUCATIMPEG2DEC_H__
 #define __GST_DUCATIMPEG2DEC_H__
 
-#include <gst/gst.h>
-
 #include "gstducatividdec.h"
 
 #include <ti/sdo/codecs/mpeg2vdec/impeg2vdec.h>
diff --git a/src/gstducatimpeg4dec.c b/src/gstducatimpeg4dec.c
index 7c16547..124731a 100644
--- a/src/gstducatimpeg4dec.c
+++ b/src/gstducatimpeg4dec.c
@@ -34,9 +34,6 @@
 #  include <config.h>
 #endif
 
-#include <gst/gst.h>
-#include <gst/video/video.h>
-
 #include "gstducatimpeg4dec.h"
 
 
diff --git a/src/gstducatimpeg4dec.h b/src/gstducatimpeg4dec.h
index 47039cf..f039c08 100644
--- a/src/gstducatimpeg4dec.h
+++ b/src/gstducatimpeg4dec.h
@@ -20,8 +20,6 @@
 #ifndef __GST_DUCATIMPEG4DEC_H__
 #define __GST_DUCATIMPEG4DEC_H__
 
-#include <gst/gst.h>
-
 #include "gstducatividdec.h"
 
 #include <ti/sdo/codecs/mpeg4dec/impeg4vdec.h>
diff --git a/src/gstducatirvdec.c b/src/gstducatirvdec.c
index c5452b3..adb7b6c 100644
--- a/src/gstducatirvdec.c
+++ b/src/gstducatirvdec.c
@@ -34,9 +34,6 @@
 #  include <config.h>
 #endif
 
-#include <gst/gst.h>
-#include <gst/video/video.h>
-
 #include "gstducatirvdec.h"
 
 
diff --git a/src/gstducatirvdec.h b/src/gstducatirvdec.h
index 0fb2645..a10e1a7 100644
--- a/src/gstducatirvdec.h
+++ b/src/gstducatirvdec.h
@@ -20,8 +20,6 @@
 #ifndef __GST_DUCATIRVDEC_H__
 #define __GST_DUCATIRVDEC_H__
 
-#include <gst/gst.h>
-
 #include "gstducatividdec.h"
 
 #include <ti/sdo/codecs/realvdec/irealvdec.h>
diff --git a/src/gstducativc1dec.c b/src/gstducativc1dec.c
index 5d56015..d76d7cd 100644
--- a/src/gstducativc1dec.c
+++ b/src/gstducativc1dec.c
@@ -34,9 +34,6 @@
 #  include <config.h>
 #endif
 
-#include <gst/gst.h>
-#include <gst/video/video.h>
-
 #include "gstducativc1dec.h"
 
 
diff --git a/src/gstducativc1dec.h b/src/gstducativc1dec.h
index 1031cdf..b5729c6 100644
--- a/src/gstducativc1dec.h
+++ b/src/gstducativc1dec.h
@@ -20,8 +20,6 @@
 #ifndef __GST_DUCATIVC1DEC_H__
 #define __GST_DUCATIVC1DEC_H__
 
-#include <gst/gst.h>
-
 #include "gstducatividdec.h"
 
 #include <ti/sdo/codecs/vc1vdec/ivc1vdec.h>
diff --git a/src/gstducatividdec.c b/src/gstducatividdec.c
index 7719fdf..4cbe6d3 100644
--- a/src/gstducatividdec.c
+++ b/src/gstducatividdec.c
@@ -21,9 +21,6 @@
 #  include <config.h>
 #endif
 
-#include <gst/gst.h>
-#include <gst/video/video.h>
-
 #include "gstducatividdec.h"
 
 GST_BOILERPLATE (GstDucatiVidDec, gst_ducati_viddec, GstElement,
diff --git a/src/gstducatividdec.h b/src/gstducatividdec.h
index 4075da3..2c25338 100644
--- a/src/gstducatividdec.h
+++ b/src/gstducatividdec.h
@@ -20,11 +20,10 @@
 #ifndef __GST_DUCATIVIDDEC_H__
 #define __GST_DUCATIVIDDEC_H__
 
-#include <gst/gst.h>
-
 #include "gstducati.h"
 #include "gstducatibufferpool.h"
 
+#include <gst/video/video.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/gstducativp6dec.c b/src/gstducativp6dec.c
index ec9be8f..dfc9ca8 100644
--- a/src/gstducativp6dec.c
+++ b/src/gstducativp6dec.c
@@ -34,9 +34,6 @@
 #  include <config.h>
 #endif
 
-#include <gst/gst.h>
-#include <gst/video/video.h>
-
 #include "gstducativp6dec.h"
 
 
diff --git a/src/gstducativp6dec.h b/src/gstducativp6dec.h
index 90c7930..f2abcfb 100644
--- a/src/gstducativp6dec.h
+++ b/src/gstducativp6dec.h
@@ -20,8 +20,6 @@
 #ifndef __GST_DUCATIVP6DEC_H__
 #define __GST_DUCATIVP6DEC_H__
 
-#include <gst/gst.h>
-
 #include "gstducatividdec.h"
 
 #include <ti/sdo/codecs/vp6dec/ivp6vdec.h>
diff --git a/src/gstducativp7dec.c b/src/gstducativp7dec.c
index fdad19a..3215c6f 100644
--- a/src/gstducativp7dec.c
+++ b/src/gstducativp7dec.c
@@ -34,9 +34,6 @@
 #  include <config.h>
 #endif
 
-#include <gst/gst.h>
-#include <gst/video/video.h>
-
 #include "gstducativp7dec.h"
 
 
diff --git a/src/gstducativp7dec.h b/src/gstducativp7dec.h
index cae9a0a..a1213ac 100644
--- a/src/gstducativp7dec.h
+++ b/src/gstducativp7dec.h
@@ -20,8 +20,6 @@
 #ifndef __GST_DUCATIVP7DEC_H__
 #define __GST_DUCATIVP7DEC_H__
 
-#include <gst/gst.h>
-
 #include "gstducatividdec.h"
 
 #include <ti/sdo/codecs/vp7dec/ivp7vdec.h>