video: make direct includes work again

Not nice to break people's code if we can avoid it. Could
add a warning in the next cycle, and then require single
includes in the cycle after.

https://bugzilla.gnome.org/show_bug.cgi?id=695889

diff --git a/gst-libs/gst/video/gstvideodecoder.h b/gst-libs/gst/video/gstvideodecoder.h
index 7c16c0ea098cb0154754240644919a9a99f8f0e2..1bdb37dcddeb8e04c58e46a18d8d96ba34d8e4b1 100644 (file)
--- a/gst-libs/gst/video/gstvideodecoder.h
+++ b/gst-libs/gst/video/gstvideodecoder.h
@@ -26,7 +26,6 @@
 #define _GST_VIDEO_DECODER_H_
 
 #include <gst/base/gstadapter.h>
-#include <gst/video/video.h>
 #include <gst/video/gstvideoutils.h>
 
 G_BEGIN_DECLS

diff --git a/gst-libs/gst/video/gstvideoutils.h b/gst-libs/gst/video/gstvideoutils.h
index 2851521fc27d4a3a6e2eb29c2637fbcf0933199b..29a2c9af9c59a403f0e7956891fd1193ce03e2d5 100644 (file)
--- a/gst-libs/gst/video/gstvideoutils.h
+++ b/gst-libs/gst/video/gstvideoutils.h
@@ -19,11 +19,14 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifndef __GST_VIDEO_H__
+#include <gst/video/video.h>
+#endif
+
 #ifndef _GST_VIDEO_UTILS_H_
 #define _GST_VIDEO_UTILS_H_
 
 #include <gst/gst.h>
-#include <gst/video/video.h>
 
 G_BEGIN_DECLS
 #define GST_TYPE_VIDEO_CODEC_STATE \

diff --git a/gst-libs/gst/video/video-chroma.h b/gst-libs/gst/video/video-chroma.h
index 8c450d2b8131c5ec4112443d0e3a8df12695b5d7..717d43b24f935bad1ad5a16c49154c79f96fe82c 100644 (file)
--- a/gst-libs/gst/video/video-chroma.h
+++ b/gst-libs/gst/video/video-chroma.h
@@ -82,6 +82,9 @@ typedef enum {
 
 typedef struct _GstVideoChromaResample GstVideoChromaResample;
 
+/* circular dependency, need to include this after defining the enums */
+#include <gst/video/video-format.h>
+
 GstVideoChromaResample * gst_video_chroma_resample_new   (GstVideoChromaMethod method,
                                                           GstVideoChromaSite site,
                                                           GstVideoChromaFlags flags,

diff --git a/gst-libs/gst/video/video-frame.h b/gst-libs/gst/video/video-frame.h
index fd56821bb67674b230a9d404f717b06cad9ab95a..670806ec8549f2c84a977d8b231ef83e1606f46b 100644 (file)
--- a/gst-libs/gst/video/video-frame.h
+++ b/gst-libs/gst/video/video-frame.h
@@ -20,13 +20,10 @@
 #ifndef __GST_VIDEO_FRAME_H__
 #define __GST_VIDEO_FRAME_H__
 
-#include <gst/gst.h>
-#include <gst/video/video-info.h>
+#include <gst/video/video-enumtypes.h>
 
 G_BEGIN_DECLS
 
-#include <gst/video/video-enumtypes.h>
-
 typedef struct _GstVideoFrame GstVideoFrame;
 
 /**
@@ -49,6 +46,10 @@ typedef enum {
   GST_VIDEO_FRAME_FLAG_ONEFIELD     = (1 << 3)
 } GstVideoFrameFlags;
 
+/* circular dependency, need to include this after defining the enums */
+#include <gst/video/video-format.h>
+#include <gst/video/video-info.h>
+
 /**
  * GstVideoFrame:
  * @info: the #GstVideoInfo