diff --git a/gst-libs/gst/vaapi/Makefile.am b/gst-libs/gst/vaapi/Makefile.am index 5bf3c105b3..f7da153ce3 100644 --- a/gst-libs/gst/vaapi/Makefile.am +++ b/gst-libs/gst/vaapi/Makefile.am @@ -21,7 +21,6 @@ noinst_LTLIBRARIES += libgstvaapi-wayland.la endif libgstvaapi_cflags = \ - -DIN_LIBGSTVAAPI \ -DIN_LIBGSTVAAPI_CORE \ -DGST_USE_UNSTABLE_API \ -I$(top_srcdir)/gst-libs \ @@ -146,7 +145,6 @@ libgstvaapi_source_priv_h = \ gstvaapivideopool_priv.h \ gstvaapiwindow_priv.h \ gstvaapiworkarounds.h \ - libgstvaapi_priv_check.h \ sysdeps.h \ $(NULL) @@ -358,7 +356,6 @@ libgstvaapi_drm_la_SOURCES = \ $(NULL) libgstvaapi_drm_la_CFLAGS = \ - -DIN_LIBGSTVAAPI \ -DGST_USE_UNSTABLE_API \ -I$(top_srcdir)/gst-libs \ $(GLIB_CFLAGS) \ @@ -388,7 +385,6 @@ libgstvaapi_x11_la_SOURCES = \ $(NULL) libgstvaapi_x11_la_CFLAGS = \ - -DIN_LIBGSTVAAPI \ -DGST_USE_UNSTABLE_API \ -I$(top_srcdir)/gst-libs \ $(GLIB_CFLAGS) \ @@ -420,7 +416,6 @@ libgstvaapi_glx_la_SOURCES = \ $(NULL) libgstvaapi_glx_la_CFLAGS = \ - -DIN_LIBGSTVAAPI \ -DGST_USE_UNSTABLE_API \ -I$(top_srcdir)/gst-libs \ $(GLIB_CFLAGS) \ @@ -452,7 +447,6 @@ libgstvaapi_egl_la_SOURCES = \ $(NULL) libgstvaapi_egl_la_CFLAGS = \ - -DIN_LIBGSTVAAPI \ -DGST_USE_UNSTABLE_API \ -I$(top_srcdir)/gst-libs \ $(GLIB_CFLAGS) \ @@ -484,7 +478,6 @@ libgstvaapi_wayland_la_SOURCES = \ $(NULL) libgstvaapi_wayland_la_CFLAGS = \ - -DIN_LIBGSTVAAPI \ -DGST_USE_UNSTABLE_API \ -I$(top_srcdir)/gst-libs \ $(GLIB_CFLAGS) \ diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_unit.h b/gst-libs/gst/vaapi/gstvaapidecoder_unit.h index 32fa9bb458..7ee77a05cf 100644 --- a/gst-libs/gst/vaapi/gstvaapidecoder_unit.h +++ b/gst-libs/gst/vaapi/gstvaapidecoder_unit.h @@ -23,8 +23,6 @@ #ifndef GST_VAAPI_DECODER_UNIT_H #define GST_VAAPI_DECODER_UNIT_H -#include "libgstvaapi_priv_check.h" - G_BEGIN_DECLS typedef struct _GstVaapiDecoderUnit GstVaapiDecoderUnit; diff --git a/gst-libs/gst/vaapi/gstvaapiminiobject.h b/gst-libs/gst/vaapi/gstvaapiminiobject.h index 562c5fc472..3f30189121 100644 --- a/gst-libs/gst/vaapi/gstvaapiminiobject.h +++ b/gst-libs/gst/vaapi/gstvaapiminiobject.h @@ -24,7 +24,6 @@ #define GST_VAAPI_MINI_OBJECT_H #include -#include "libgstvaapi_priv_check.h" G_BEGIN_DECLS diff --git a/gst-libs/gst/vaapi/gstvaapiutils.h b/gst-libs/gst/vaapi/gstvaapiutils.h index 41b5762b82..82efc31550 100644 --- a/gst-libs/gst/vaapi/gstvaapiutils.h +++ b/gst-libs/gst/vaapi/gstvaapiutils.h @@ -26,7 +26,6 @@ #define GST_VAAPI_UTILS_H #include "config.h" -#include "libgstvaapi_priv_check.h" #include #include diff --git a/gst-libs/gst/vaapi/gstvaapiutils_glx.h b/gst-libs/gst/vaapi/gstvaapiutils_glx.h index 3fafe5ec99..f5c632cc4c 100644 --- a/gst-libs/gst/vaapi/gstvaapiutils_glx.h +++ b/gst-libs/gst/vaapi/gstvaapiutils_glx.h @@ -26,7 +26,6 @@ #define GST_VAAPI_UTILS_GLX_H #include "config.h" -#include "libgstvaapi_priv_check.h" #include #include #include diff --git a/gst-libs/gst/vaapi/gstvaapiutils_h264_priv.h b/gst-libs/gst/vaapi/gstvaapiutils_h264_priv.h index 6a0c61d03c..eb582f5ee7 100644 --- a/gst-libs/gst/vaapi/gstvaapiutils_h264_priv.h +++ b/gst-libs/gst/vaapi/gstvaapiutils_h264_priv.h @@ -24,7 +24,6 @@ #define GST_VAAPI_UTILS_H264_PRIV_H #include "gstvaapiutils_h264.h" -#include "libgstvaapi_priv_check.h" #include "gstvaapisurface.h" G_BEGIN_DECLS diff --git a/gst-libs/gst/vaapi/gstvaapiutils_h265_priv.h b/gst-libs/gst/vaapi/gstvaapiutils_h265_priv.h index 7b5173ed4d..9e1b83c9d6 100644 --- a/gst-libs/gst/vaapi/gstvaapiutils_h265_priv.h +++ b/gst-libs/gst/vaapi/gstvaapiutils_h265_priv.h @@ -24,7 +24,6 @@ #define GST_VAAPI_UTILS_H265_PRIV_H #include "gstvaapiutils_h265.h" -#include "libgstvaapi_priv_check.h" #include "gstvaapisurface.h" G_BEGIN_DECLS diff --git a/gst-libs/gst/vaapi/gstvaapiutils_mpeg2_priv.h b/gst-libs/gst/vaapi/gstvaapiutils_mpeg2_priv.h index 231a6b4fcd..3ac65c5d3b 100644 --- a/gst-libs/gst/vaapi/gstvaapiutils_mpeg2_priv.h +++ b/gst-libs/gst/vaapi/gstvaapiutils_mpeg2_priv.h @@ -24,7 +24,6 @@ #define GST_VAAPI_UTILS_MPEG2_PRIV_H #include "gstvaapiutils_mpeg2.h" -#include "libgstvaapi_priv_check.h" #include "gstvaapisurface.h" G_BEGIN_DECLS diff --git a/gst-libs/gst/vaapi/gstvaapiutils_x11.h b/gst-libs/gst/vaapi/gstvaapiutils_x11.h index 500a47fc39..b205585b29 100644 --- a/gst-libs/gst/vaapi/gstvaapiutils_x11.h +++ b/gst-libs/gst/vaapi/gstvaapiutils_x11.h @@ -26,7 +26,6 @@ #define GST_VAAPI_UTILS_X11_H #include "config.h" -#include "libgstvaapi_priv_check.h" #include #include diff --git a/gst-libs/gst/vaapi/libgstvaapi_priv_check.h b/gst-libs/gst/vaapi/libgstvaapi_priv_check.h deleted file mode 100644 index e7cf0e1f08..0000000000 --- a/gst-libs/gst/vaapi/libgstvaapi_priv_check.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * libgstvaapi_priv_check.h - Check file is included from within libgstvaapi - * - * Copyright (C) 2014 Intel Corporation - * Author: Gwenole Beauchesne - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - */ - -#ifndef IN_LIBGSTVAAPI -# error "This file is only meant to be included from within libgstvaapi" -#endif diff --git a/gst-libs/gst/vaapi/meson.build b/gst-libs/gst/vaapi/meson.build index 3519f0060f..debdfe9743 100644 --- a/gst-libs/gst/vaapi/meson.build +++ b/gst-libs/gst/vaapi/meson.build @@ -217,7 +217,7 @@ endif gstlibvaapi = static_library('gstlibvaapi-@0@'.format(api_version), gstlibvaapi_sources, - c_args : gstreamer_vaapi_args + ['-DIN_LIBGSTVAAPI', '-DIN_LIBGSTVAAPI_CORE', '-DGST_USE_UNSTABLE_API', '-DGST_VAAPI_VERSION_ID="@0@"'.format(gst_version)], + c_args : gstreamer_vaapi_args + ['-DIN_LIBGSTVAAPI_CORE', '-DGST_USE_UNSTABLE_API', '-DGST_VAAPI_VERSION_ID="@0@"'.format(gst_version)], include_directories: [configinc, libsinc], version : libversion, soversion : soversion,