demux: dash: simplify integer parsing using templates

[vlc] / modules / video_output / opengl.h

diff --git a/modules/video_output/opengl.h b/modules/video_output/opengl.h
index b9d18ec47c9c4db3908614e18ce53c5156c62f1f..b01327e6ee9b280226b2a74c627a2a0ee1617afe 100644 (file)
--- a/modules/video_output/opengl.h
+++ b/modules/video_output/opengl.h
@@ -1,14 +1,15 @@
 /*****************************************************************************
  * opengl.h: OpenGL vout_display helpers
  *****************************************************************************
- * Copyright (C) 2004 VLC authors and VideoLAN
+ * Copyright (C) 2004-2013 VLC authors and VideoLAN
  * Copyright (C) 2009 Laurent Aimar
  *
- * Authors: Cyril Deguet <asmax@videolan.org>
- *          Gildas Bazin <gbazin@videolan.org>
- *          Eric Petit <titer@m0k.org>
- *          Cedric Cocquebert <cedric.cocquebert@supelec.fr>
- *          Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
+ * Authors: Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
+ *          Rémi Denis-Courmont
+ *          Jean-Baptiste Kempf <jb@videolan.org>
+ *          Ilkka Ollakka <ileoo@videolan.org>
+ *          Felix Paul Kühne <fkuehne at videolan dot org>
+ *          Rafaël Carré <funman@videolanorg>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published by
@@ -25,6 +26,9 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifndef VLC_OPENGL_H
+#define VLC_OPENGL_H
+
 #include <vlc_common.h>
 #include <vlc_picture_pool.h>
 #include <vlc_opengl.h>
@@ -52,7 +56,7 @@
 # elif USE_OPENGL_ES == 1
 #  include <GLES/gl.h>
 # else
-#  ifdef WIN32
+#  ifdef _WIN32
 #   include <GL/glew.h>
 #   undef glClientActiveTexture
 #   undef glActiveTexture
@@ -89,3 +93,5 @@ int vout_display_opengl_Prepare(vout_display_opengl_t *vgl,
                                 picture_t *picture, subpicture_t *subpicture);
 int vout_display_opengl_Display(vout_display_opengl_t *vgl,
                                 const video_format_t *source);
+
+#endif