[FFmpeg-cvslog] Fix OpenGL device compilation with msvc gl.h

Matt Oliver git at videolan.org
Wed Apr 16 18:35:37 CEST 2014


ffmpeg | branch: master | Matt Oliver <protogonoi at gmail.com> | Tue Apr 15 15:22:50 2014 +1000| [27f184ef40e8da09d9dfc8f71a8d1893729381f6] | committer: Michael Niedermayer

Fix OpenGL device compilation with msvc gl.h

Reveiwed-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=27f184ef40e8da09d9dfc8f71a8d1893729381f6
---

 libavdevice/opengl_enc.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavdevice/opengl_enc.c b/libavdevice/opengl_enc.c
index 6be0398..4e25f19 100644
--- a/libavdevice/opengl_enc.c
+++ b/libavdevice/opengl_enc.c
@@ -30,6 +30,9 @@
 
 #include "config.h"
 
+#if HAVE_WINDOWS_H
+#include <windows.h>
+#endif
 #if HAVE_OPENGL_GL3_H
 #include <OpenGL/gl3.h>
 #elif HAVE_ES2_GL_H
@@ -41,9 +44,6 @@
 #if HAVE_GLXGETPROCADDRESS
 #include <GL/glx.h>
 #endif
-#if HAVE_WINDOWS_H
-#include <windows.h>
-#endif
 
 #if HAVE_SDL
 #include <SDL.h>



More information about the ffmpeg-cvslog mailing list