summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosep Torra <n770galaxy@gmail.com>2013-04-22 12:20:27 +0200
committerJosep Torra <n770galaxy@gmail.com>2013-04-22 12:20:27 +0200
commitb846f632ebde80d5e94f172300ae660eda886957 (patch)
tree6a8da5a6c0398f89468e8553f6498e32b8f859ee
parentbcd474994594a67183fb4de75e2250b1e298e814 (diff)
downloadgstreamer-plugins-bad-b846f632ebde80d5e94f172300ae660eda886957.tar.gz
eglglessink: silence warnings building for RPI related to 'vcos_*'
-rw-r--r--ext/eglgles/gstegladaptation.h15
-rw-r--r--ext/eglgles/gsteglglessink.c15
-rw-r--r--ext/eglgles/video_platform_wrapper.c15
3 files changed, 45 insertions, 0 deletions
diff --git a/ext/eglgles/gstegladaptation.h b/ext/eglgles/gstegladaptation.h
index 8e6866c98..4dfaca773 100644
--- a/ext/eglgles/gstegladaptation.h
+++ b/ext/eglgles/gstegladaptation.h
@@ -51,6 +51,16 @@
#include <gst/gst.h>
+#if defined (USE_EGL_RPI) && defined(__GNUC__)
+#ifndef __VCCOREVER__
+#define __VCCOREVER__ 0x04000000
+#endif
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wredundant-decls"
+#pragma GCC optimize ("gnu89-inline")
+#endif
+
#ifdef HAVE_IOS
#include <OpenGLES/ES2/gl.h>
@@ -65,6 +75,11 @@
#include <bcm_host.h>
#endif
+#if defined (USE_EGL_RPI) && defined(__GNUC__)
+#pragma GCC reset_options
+#pragma GCC diagnostic pop
+#endif
+
#include <gst/video/video.h>
#define GST_EGLGLESSINK_IMAGE_NOFMT 0
diff --git a/ext/eglgles/gsteglglessink.c b/ext/eglgles/gsteglglessink.c
index 42b9d99a2..97ae0fb2b 100644
--- a/ext/eglgles/gsteglglessink.c
+++ b/ext/eglgles/gsteglglessink.c
@@ -118,10 +118,25 @@
#include <gst/video/gstvideosink.h>
#include <gst/interfaces/xoverlay.h>
+#if defined (USE_EGL_RPI) && defined(__GNUC__)
+#ifndef __VCCOREVER__
+#define __VCCOREVER__ 0x04000000
+#endif
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wredundant-decls"
+#pragma GCC optimize ("gnu89-inline")
+#endif
+
#ifdef USE_EGL_RPI
#include <bcm_host.h>
#endif
+#if defined (USE_EGL_RPI) && defined(__GNUC__)
+#pragma GCC reset_options
+#pragma GCC diagnostic pop
+#endif
+
#include "gsteglglessink.h"
GST_DEBUG_CATEGORY_STATIC (gst_eglglessink_debug);
diff --git a/ext/eglgles/video_platform_wrapper.c b/ext/eglgles/video_platform_wrapper.c
index a9c24782a..d03952cf8 100644
--- a/ext/eglgles/video_platform_wrapper.c
+++ b/ext/eglgles/video_platform_wrapper.c
@@ -46,12 +46,27 @@
# include <config.h>
#endif
+#if defined (USE_EGL_RPI) && defined(__GNUC__)
+#ifndef __VCCOREVER__
+#define __VCCOREVER__ 0x04000000
+#endif
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wredundant-decls"
+#pragma GCC optimize ("gnu89-inline")
+#endif
+
#define EGL_EGLEXT_PROTOTYPES
#include <EGL/egl.h>
#include <EGL/eglext.h>
#include <GLES2/gl2.h>
+#if defined (USE_EGL_RPI) && defined(__GNUC__)
+#pragma GCC reset_options
+#pragma GCC diagnostic pop
+#endif
+
#include <gst/gst.h>
#include "video_platform_wrapper.h"