[vlc-commits] gl: move internal.h to converter.h

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Aug 29 14:11:10 2017 +0200| [144206d29c366a8190df38a9d11d62495a2a25c3] | committer: Thomas Guillem

gl: move internal.h to converter.h

Refs #18575

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=144206d29c366a8190df38a9d11d62495a2a25c3
---

 modules/video_output/Makefile.am                        | 2 +-
 modules/video_output/opengl/{internal.h => converter.h} | 6 +++---
 modules/video_output/opengl/converter_android.c         | 2 +-
 modules/video_output/opengl/converter_cvpx.c            | 2 +-
 modules/video_output/opengl/converter_vaapi.c           | 2 +-
 modules/video_output/opengl/converters.c                | 2 +-
 modules/video_output/opengl/vout_helper.c               | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index ce6ce877c0..695cd680b4 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -7,7 +7,7 @@ OPENGL_COMMONCFLAGS =
 OPENGL_COMMONLDFLAGS =
 OPENGL_COMMONLIBS =
 OPENGL_COMMONSOURCES = video_output/opengl/vout_helper.c \
-	video_output/opengl/vout_helper.h video_output/opengl/internal.h \
+	video_output/opengl/vout_helper.h video_output/opengl/converter.h \
 	video_output/opengl/converters.c
 if HAVE_ANDROID
 OPENGL_COMMONSOURCES += video_output/opengl/converter_android.c
diff --git a/modules/video_output/opengl/internal.h b/modules/video_output/opengl/converter.h
similarity index 99%
rename from modules/video_output/opengl/internal.h
rename to modules/video_output/opengl/converter.h
index 90b91b41bd..6e1d10497b 100644
--- a/modules/video_output/opengl/internal.h
+++ b/modules/video_output/opengl/converter.h
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * opengl_internal.h: OpenGL internal header
+ * converter.h: OpenGL internal header
  *****************************************************************************
  * Copyright (C) 2016 VLC authors and VideoLAN
  *
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef VLC_OPENGL_INTERNAL_H
-#define VLC_OPENGL_INTERNAL_H
+#ifndef VLC_OPENGL_CONVERTER_H
+#define VLC_OPENGL_CONVERTER_H
 
 #include "vout_helper.h"
 
diff --git a/modules/video_output/opengl/converter_android.c b/modules/video_output/opengl/converter_android.c
index 5a2453c675..6fce879556 100644
--- a/modules/video_output/opengl/converter_android.c
+++ b/modules/video_output/opengl/converter_android.c
@@ -27,7 +27,7 @@
 #endif
 
 #include <GLES2/gl2ext.h>
-#include "internal.h"
+#include "converter.h"
 #include "../android/display.h"
 #include "../android/utils.h"
 
diff --git a/modules/video_output/opengl/converter_cvpx.c b/modules/video_output/opengl/converter_cvpx.c
index 7c2472ac13..7ab31e0fd6 100644
--- a/modules/video_output/opengl/converter_cvpx.c
+++ b/modules/video_output/opengl/converter_cvpx.c
@@ -22,7 +22,7 @@
 # include "config.h"
 #endif
 
-#include "internal.h"
+#include "converter.h"
 #include "../../codec/vt_utils.h"
 
 #if TARGET_OS_IPHONE
diff --git a/modules/video_output/opengl/converter_vaapi.c b/modules/video_output/opengl/converter_vaapi.c
index 463aec0345..4979bfc31a 100644
--- a/modules/video_output/opengl/converter_vaapi.c
+++ b/modules/video_output/opengl/converter_vaapi.c
@@ -22,7 +22,7 @@
 # include "config.h"
 #endif
 
-#include "internal.h"
+#include "converter.h"
 #include "../../hw/vaapi/vlc_vaapi.h"
 #include <vlc_vout_window.h>
 
diff --git a/modules/video_output/opengl/converters.c b/modules/video_output/opengl/converters.c
index f2e6ef26aa..7f2e775c3d 100644
--- a/modules/video_output/opengl/converters.c
+++ b/modules/video_output/opengl/converters.c
@@ -29,7 +29,7 @@
 #include <vlc_common.h>
 #include <vlc_memory.h>
 #include <vlc_memstream.h>
-#include "internal.h"
+#include "converter.h"
 
 #ifndef GL_RED
 # define GL_RED 0x1903
diff --git a/modules/video_output/opengl/vout_helper.c b/modules/video_output/opengl/vout_helper.c
index a0bc32d9fe..372bdd7c96 100644
--- a/modules/video_output/opengl/vout_helper.c
+++ b/modules/video_output/opengl/vout_helper.c
@@ -41,7 +41,7 @@
 #include <vlc_viewpoint.h>
 
 #include "vout_helper.h"
-#include "internal.h"
+#include "converter.h"
 
 #ifndef GL_CLAMP_TO_EDGE
 # define GL_CLAMP_TO_EDGE 0x812F