diff options
| author | Michael Niedermayer <[email protected]> | 2014-02-02 02:42:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-02-02 02:42:15 +0100 |
| commit | 549f052239d9a63d3094df5a6d53448d5282cf24 (patch) | |
| tree | a7b9c602a08cd7e54b8ecfe047028bfec0104d19 /libavdevice/opengl_enc_shaders.h | |
| parent | 96c4ba2392b9cd55a5e84cb28db5c0c7e53cd390 (diff) | |
| parent | 5059d8dfe3c8c04b3fbdc266ac87305a2bbbf5e1 (diff) | |
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavd/opengl_enc: remove inlines
lavd/opengl_enc: fix window caption
lavd/opengl_enc: simplify opengl_load_procedures usage
lavd/opengl_enc: factorize deinit_context function
lavd/opengl_enc: factorize create/release window functions
lavd/opengl_enc: rename GL_RED_COMPONENT define
lavd/opengl_enc: create format description table
lavd/opengl_enc_shaders: make shaders code static and const
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavdevice/opengl_enc_shaders.h')
| -rw-r--r-- | libavdevice/opengl_enc_shaders.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavdevice/opengl_enc_shaders.h b/libavdevice/opengl_enc_shaders.h index e3115c4f10..66104e03cb 100644 --- a/libavdevice/opengl_enc_shaders.h +++ b/libavdevice/opengl_enc_shaders.h @@ -23,7 +23,7 @@ #include "libavutil/pixfmt.h" -const char *FF_OPENGL_VERTEX_SHADER = +static const char * const FF_OPENGL_VERTEX_SHADER = "uniform mat4 u_projectionMatrix;" "uniform mat4 u_modelViewMatrix;" @@ -41,7 +41,7 @@ const char *FF_OPENGL_VERTEX_SHADER = /** * Fragment shader for packet RGBA formats. */ -const char *FF_OPENGL_FRAGMENT_SHADER_RGBA_PACKET = +static const char * const FF_OPENGL_FRAGMENT_SHADER_RGBA_PACKET = #if defined(GL_ES_VERSION_2_0) "precision mediump float;" #endif @@ -58,7 +58,7 @@ const char *FF_OPENGL_FRAGMENT_SHADER_RGBA_PACKET = /** * Fragment shader for packet RGB formats. */ -const char *FF_OPENGL_FRAGMENT_SHADER_RGB_PACKET = +static const char * const FF_OPENGL_FRAGMENT_SHADER_RGB_PACKET = #if defined(GL_ES_VERSION_2_0) "precision mediump float;" #endif @@ -75,7 +75,7 @@ const char *FF_OPENGL_FRAGMENT_SHADER_RGB_PACKET = /** * Fragment shader for planar RGBA formats. */ -const char *FF_OPENGL_FRAGMENT_SHADER_RGBA_PLANAR = +static const char * const FF_OPENGL_FRAGMENT_SHADER_RGBA_PLANAR = #if defined(GL_ES_VERSION_2_0) "precision mediump float;" #endif @@ -97,7 +97,7 @@ const char *FF_OPENGL_FRAGMENT_SHADER_RGBA_PLANAR = /** * Fragment shader for planar RGB formats. */ -const char *FF_OPENGL_FRAGMENT_SHADER_RGB_PLANAR = +static const char * const FF_OPENGL_FRAGMENT_SHADER_RGB_PLANAR = #if defined(GL_ES_VERSION_2_0) "precision mediump float;" #endif @@ -118,7 +118,7 @@ const char *FF_OPENGL_FRAGMENT_SHADER_RGB_PLANAR = /** * Fragment shader for planar YUV formats. */ -const char *FF_OPENGL_FRAGMENT_SHADER_YUV_PLANAR = +static const char * const FF_OPENGL_FRAGMENT_SHADER_YUV_PLANAR = #if defined(GL_ES_VERSION_2_0) "precision mediump float;" #endif @@ -147,7 +147,7 @@ const char *FF_OPENGL_FRAGMENT_SHADER_YUV_PLANAR = /** * Fragment shader for planar YUVA formats. */ -const char *FF_OPENGL_FRAGMENT_SHADER_YUVA_PLANAR = +static const char * const FF_OPENGL_FRAGMENT_SHADER_YUVA_PLANAR = #if defined(GL_ES_VERSION_2_0) "precision mediump float;" #endif |