Merge branch 'alt-ogl-loader' of https://github.com/jp9000/obs-studio into alt-ogl-loader

2014-01-25 23:59:26 -06:00
parent ae17c457a7 f4379d7889
commit 666f0be14f
5 changed files with 19 additions and 22 deletions
--- a/libobs-opengl/gl-subsystem.c
+++ b/libobs-opengl/gl-subsystem.c
@@ -57,7 +57,7 @@ static const char* debug_severity_table[] = {

 static void APIENTRY gl_debug_proc(
 	GLenum source, GLenum type, GLuint id, GLenum severity, 
-	GLsizei length, const GLchar *message, GLvoid *data )
+	GLsizei length, const GLchar *message, const GLvoid *data )
 {
 	blog(	LOG_DEBUG,
 		"[%s][%s]{%s}: %.*s",