Update: correctly handle different line endings

[vlc] / modules / video_output / opengl.c

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index 1887cdb7cfc59425d34d591723c47d08c86a759b..0db1210e392ea6fda26fed7a8869b7d853b4b09d 100644 (file)
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -41,6 +41,8 @@
 #ifdef __APPLE__
 # include <OpenGL/gl.h>
 # include <OpenGL/glext.h>
+#else
+# include <GL/gl.h>
 #endif
 
 #ifndef YCBCR_MESA
@@ -67,7 +69,6 @@
 # define VLCGL_TYPE   GL_UNSIGNED_SHORT_8_8_APPLE
 #else
 
-# include <GL/gl.h>
 # define VLCGL_TARGET GL_TEXTURE_2D
 
 /* RV32 */
@@ -251,7 +252,7 @@ static int Init( vout_thread_t *p_vout )
     p_vout->output.i_chroma = VLC_CODEC_YUYV;
     i_pixel_pitch = 2;
 
-#elif (VLCGL_FORMAT == GL_YCBCR_422_APPLE)
+#elif defined( GL_YCBCR_422_APPLE ) && (VLCGL_FORMAT == GL_YCBCR_422_APPLE)
     p_vout->output.i_chroma = VLC_CODEC_UYVY;
     i_pixel_pitch = 2;