diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp index 205ee4bd296..51089792283 100644 --- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp +++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp @@ -66,24 +66,6 @@ #include -#if USE(LIBEPOXY) -// Include the header before . -#include - -// Workaround build issue with RPi userland GLESv2 headers and libepoxy -#if !GST_CHECK_VERSION(1, 14, 0) -#include -#if defined(GST_GL_HAVE_WINDOW_DISPMANX) && GST_GL_HAVE_WINDOW_DISPMANX -#define __gl2_h_ -#undef GST_GL_HAVE_GLSYNC -#define GST_GL_HAVE_GLSYNC 1 -#endif -#endif // !GST_CHECK_VERSION(1, 14, 0) -#endif // USE(LIBEPOXY) - -#define GST_USE_UNSTABLE_API -#include -#undef GST_USE_UNSTABLE_API #include "GLContext.h" #if USE(GLX) diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h index 59afdfcc01b..980ea1986c4 100644 --- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h +++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h @@ -37,6 +37,25 @@ #include #include +#if USE(LIBEPOXY) +// Include the header before . +#include + +// Workaround build issue with RPi userland GLESv2 headers and libepoxy +#if !GST_CHECK_VERSION(1, 14, 0) +#include +#if defined(GST_GL_HAVE_WINDOW_DISPMANX) && GST_GL_HAVE_WINDOW_DISPMANX +#define __gl2_h_ +#undef GST_GL_HAVE_GLSYNC +#define GST_GL_HAVE_GLSYNC 1 +#endif +#endif // !GST_CHECK_VERSION(1, 14, 0) +#endif // USE(LIBEPOXY) + +#define GST_USE_UNSTABLE_API +#include +#undef GST_USE_UNSTABLE_API + #if USE(TEXTURE_MAPPER_GL) #include "TextureMapperGL.h" #if USE(NICOSIA)