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
This commit is contained in:
Tim-Philipp Müller 2013-08-16 13:47:31 +01:00
parent 6b070784c4
commit 2f05268517
4 changed files with 12 additions and 6 deletions

View file

@ -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

View file

@ -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 \

View file

@ -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,

View file

@ -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