From 13402f0b98343a4e14e8d8cb41fdb44727a6256c Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Fri, 23 May 2014 12:07:50 +1000 Subject: [PATCH] gl/memory: provide compatability defines fixes build on android/OS X --- gst-libs/gst/gl/gstglmemory.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gst-libs/gst/gl/gstglmemory.c b/gst-libs/gst/gl/gstglmemory.c index a5c60d7405..90e73a2c56 100644 --- a/gst-libs/gst/gl/gstglmemory.c +++ b/gst-libs/gst/gl/gstglmemory.c @@ -60,6 +60,12 @@ static GstAllocator *_gl_allocator; #ifndef GL_RG #define GL_RG 0x8227 #endif +#ifndef GL_R8 +#define GL_R8 0x8229 +#endif +#ifndef GL_RG8 +#define GL_RG8 0x822B +#endif #ifndef GL_PIXEL_PACK_BUFFER #define GL_PIXEL_PACK_BUFFER 0x88EB #endif @@ -269,7 +275,7 @@ _sized_gl_format_from_gl_format_type (GLenum format, GLenum type) return GL_RGB8; break; case GL_UNSIGNED_SHORT_5_6_5: - return GL_RGB565; + return GL_RGB; break; } break;