eglglessink: silence warnings building for RPI related to 'vcos_*'

This commit is contained in:
Josep Torra 2013-04-18 12:24:18 +02:00
parent 9a88d737fc
commit 1190a79b19
3 changed files with 34 additions and 9 deletions

View file

@ -51,16 +51,26 @@
# include <config.h>
#endif
#include <gst/gst.h>
#include <gst/video/gstvideopool.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
#define EGL_EGLEXT_PROTOTYPES
#define GL_GLEXT_PROTOTYPES
#include <gst/gst.h>
#include <gst/egl/egl.h>
#include <gst/video/gstvideopool.h>
#ifdef HAVE_IOS
#include <OpenGLES/ES2/gl.h>
#else
#include <EGL/egl.h>
#include <EGL/eglext.h>
@ -68,6 +78,11 @@
#include <GLES2/gl2ext.h>
#endif
#if defined (USE_EGL_RPI) && defined(__GNUC__)
#pragma GCC reset_options
#pragma GCC diagnostic pop
#endif
#define GST_EGLGLESSINK_EGL_MIN_VERSION 1
static const EGLint eglglessink_RGBA8888_attribs[] = {

View file

@ -123,18 +123,13 @@
#include <gst/video/gstvideometa.h>
#include <gst/video/gstvideopool.h>
#include <gst/video/videooverlay.h>
#include <gst/egl/egl.h>
#include <EGL/egl.h>
#include <EGL/eglext.h>
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#include "gstegladaptation.h"
#ifdef USE_EGL_RPI
#include <bcm_host.h>
#endif
#include "gstegladaptation.h"
#include "gsteglglessink.h"
GST_DEBUG_CATEGORY_STATIC (gst_eglglessink_debug);

View file

@ -46,6 +46,16 @@
# 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
#define GL_GLEXT_PROTOTYPES
#include <EGL/egl.h>
@ -53,6 +63,11 @@
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#if defined (USE_EGL_RPI) && defined(__GNUC__)
#pragma GCC reset_options
#pragma GCC diagnostic pop
#endif
#include <string.h>
#include <gst/gst.h>