[vlc-commits] generic opengl code: expose helper function
Felix Paul Kühne
git at videolan.org
Fri Aug 21 19:10:33 CEST 2015
vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Fri Aug 21 18:05:38 2015 +0200| [1bd9e72afe52b42e712d27e5996902fcfa03ce57] | committer: Felix Paul Kühne
generic opengl code: expose helper function
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1bd9e72afe52b42e712d27e5996902fcfa03ce57
---
modules/video_output/opengl.c | 7 +------
modules/video_output/opengl.h | 7 +++++++
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index c0ddbce..09667fb 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -95,11 +95,6 @@
# define SUPPORTS_FIXED_PIPELINE
#endif
-static const vlc_fourcc_t gl_subpicture_chromas[] = {
- VLC_CODEC_RGBA,
- 0
-};
-
typedef struct {
GLuint texture;
unsigned format;
@@ -1002,7 +997,7 @@ static const GLfloat identity[] = {
0.0f, 0.0f, 0.0f, 1.0f
};
-static void orientationTransformMatrix(GLfloat matrix[static 16], video_orientation_t orientation) {
+void orientationTransformMatrix(GLfloat matrix[static 16], video_orientation_t orientation) {
memcpy(matrix, identity, sizeof(identity));
diff --git a/modules/video_output/opengl.h b/modules/video_output/opengl.h
index b01327e..4ae9400 100644
--- a/modules/video_output/opengl.h
+++ b/modules/video_output/opengl.h
@@ -67,6 +67,11 @@
# endif
#endif
+static const vlc_fourcc_t gl_subpicture_chromas[] = {
+ VLC_CODEC_RGBA,
+ 0
+};
+
static inline bool HasExtension(const char *apis, const char *api)
{
size_t apilen = strlen(api);
@@ -80,6 +85,8 @@ static inline bool HasExtension(const char *apis, const char *api)
return false;
}
+void orientationTransformMatrix(GLfloat matrix[static 16], video_orientation_t orientation);
+
typedef struct vout_display_opengl_t vout_display_opengl_t;
vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
More information about the vlc-commits
mailing list