mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-17 19:55:32 +00:00
Include gstvaapicompat.h in source files only, not headers.
This commit is contained in:
parent
1727295d2c
commit
520f7ac5b6
6 changed files with 14 additions and 17 deletions
|
@ -25,6 +25,7 @@
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include "gstvaapicompat.h"
|
||||||
#include "gstvaapiutils.h"
|
#include "gstvaapiutils.h"
|
||||||
#include "gstvaapiimage.h"
|
#include "gstvaapiimage.h"
|
||||||
#include "gstvaapiobject_priv.h"
|
#include "gstvaapiobject_priv.h"
|
||||||
|
|
|
@ -24,8 +24,8 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include <glib.h>
|
|
||||||
#include <gst/video/video.h>
|
#include <gst/video/video.h>
|
||||||
|
#include "gstvaapicompat.h"
|
||||||
#include "gstvaapiimageformat.h"
|
#include "gstvaapiimageformat.h"
|
||||||
|
|
||||||
typedef enum _GstVaapiImageFormatType GstVaapiImageFormatType;
|
typedef enum _GstVaapiImageFormatType GstVaapiImageFormatType;
|
||||||
|
|
|
@ -21,14 +21,7 @@
|
||||||
#ifndef GST_VAAPI_IMAGE_FORMAT_H
|
#ifndef GST_VAAPI_IMAGE_FORMAT_H
|
||||||
#define GST_VAAPI_IMAGE_FORMAT_H
|
#define GST_VAAPI_IMAGE_FORMAT_H
|
||||||
|
|
||||||
#ifdef GST_VAAPI_USE_OLD_VAAPI_0_29
|
#include <gst/gstvalue.h>
|
||||||
# include <va.h>
|
|
||||||
# include <gst/vaapi/gstvaapicompat.h>
|
|
||||||
#else
|
|
||||||
# include <va/va.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <glib/gtypes.h>
|
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
|
@ -56,14 +49,14 @@ typedef enum _GstVaapiImageFormat GstVaapiImageFormat;
|
||||||
* The set of all image formats for #GstVaapiImage.
|
* The set of all image formats for #GstVaapiImage.
|
||||||
*/
|
*/
|
||||||
enum _GstVaapiImageFormat {
|
enum _GstVaapiImageFormat {
|
||||||
GST_VAAPI_IMAGE_NV12 = VA_FOURCC('N','V','1','2'),
|
GST_VAAPI_IMAGE_NV12 = GST_MAKE_FOURCC('N','V','1','2'),
|
||||||
GST_VAAPI_IMAGE_YV12 = VA_FOURCC('Y','V','1','2'),
|
GST_VAAPI_IMAGE_YV12 = GST_MAKE_FOURCC('Y','V','1','2'),
|
||||||
GST_VAAPI_IMAGE_I420 = VA_FOURCC('I','4','2','0'),
|
GST_VAAPI_IMAGE_I420 = GST_MAKE_FOURCC('I','4','2','0'),
|
||||||
GST_VAAPI_IMAGE_AYUV = VA_FOURCC('A','Y','U','V'),
|
GST_VAAPI_IMAGE_AYUV = GST_MAKE_FOURCC('A','Y','U','V'),
|
||||||
GST_VAAPI_IMAGE_ARGB = VA_FOURCC('A','R','G','B'),
|
GST_VAAPI_IMAGE_ARGB = GST_MAKE_FOURCC('A','R','G','B'),
|
||||||
GST_VAAPI_IMAGE_RGBA = VA_FOURCC('R','G','B','A'),
|
GST_VAAPI_IMAGE_RGBA = GST_MAKE_FOURCC('R','G','B','A'),
|
||||||
GST_VAAPI_IMAGE_ABGR = VA_FOURCC('A','B','G','R'),
|
GST_VAAPI_IMAGE_ABGR = GST_MAKE_FOURCC('A','B','G','R'),
|
||||||
GST_VAAPI_IMAGE_BGRA = VA_FOURCC('B','G','R','A'),
|
GST_VAAPI_IMAGE_BGRA = GST_MAKE_FOURCC('B','G','R','A'),
|
||||||
};
|
};
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
#include "gstvaapicompat.h"
|
||||||
#include "gstvaapiobject.h"
|
#include "gstvaapiobject.h"
|
||||||
#include "gstvaapiobject_priv.h"
|
#include "gstvaapiobject_priv.h"
|
||||||
#include "gstvaapiparamspecs.h"
|
#include "gstvaapiparamspecs.h"
|
||||||
|
|
|
@ -25,6 +25,7 @@
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include "gstvaapicompat.h"
|
||||||
#include "gstvaapiutils.h"
|
#include "gstvaapiutils.h"
|
||||||
#include "gstvaapisubpicture.h"
|
#include "gstvaapisubpicture.h"
|
||||||
#include "gstvaapiobject_priv.h"
|
#include "gstvaapiobject_priv.h"
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <X11/Xatom.h>
|
#include <X11/Xatom.h>
|
||||||
|
#include "gstvaapicompat.h"
|
||||||
#include "gstvaapiwindow_x11.h"
|
#include "gstvaapiwindow_x11.h"
|
||||||
#include "gstvaapidisplay_x11.h"
|
#include "gstvaapidisplay_x11.h"
|
||||||
#include "gstvaapiutils_x11.h"
|
#include "gstvaapiutils_x11.h"
|
||||||
|
|
Loading…
Reference in a new issue