git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
572f5eb
)
Fix OpenGL device compilation with msvc gl.h
author
Matt Oliver
<protogonoi@gmail.com>
Tue, 15 Apr 2014 05:22:50 +0000
(15:22 +1000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 16 Apr 2014 16:05:40 +0000
(18:05 +0200)
Reveiwed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavdevice/opengl_enc.c
patch
|
blob
|
history
diff --git
a/libavdevice/opengl_enc.c
b/libavdevice/opengl_enc.c
index
6be0398
..
4e25f19
100644
(file)
--- 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>