aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukasz Marek <lukasz.m.luki@gmail.com>2014-02-02 02:26:02 +0100
committerLukasz Marek <lukasz.m.luki@gmail.com>2014-02-02 02:26:02 +0100
commit5059d8dfe3c8c04b3fbdc266ac87305a2bbbf5e1 (patch)
tree5ad5c58f63debcf7175a6c1c55fb0512f8e46edc
parent69b19f2642c34b0ad81eeaaf182e2b5158dfb07c (diff)
downloadffmpeg-5059d8dfe3c8c04b3fbdc266ac87305a2bbbf5e1.tar.gz
lavd/opengl_enc: remove inlines
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
-rw-r--r--libavdevice/opengl_enc.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/libavdevice/opengl_enc.c b/libavdevice/opengl_enc.c
index d4516a3752..207fbd0084 100644
--- a/libavdevice/opengl_enc.c
+++ b/libavdevice/opengl_enc.c
@@ -548,16 +548,14 @@ static int av_cold opengl_load_procedures(OpenGLContext *opengl)
}
#endif
-static av_always_inline void opengl_make_identity(float matrix[16])
+static void opengl_make_identity(float matrix[16])
{
memset(matrix, 0, 16 * sizeof(float));
matrix[0] = matrix[5] = matrix[10] = matrix[15] = 1.0f;
}
-static av_always_inline void opengl_make_ortho(float matrix[16],
- float left, float right,
- float bottom, float top,
- float nearZ, float farZ)
+static void opengl_make_ortho(float matrix[16], float left, float right,
+ float bottom, float top, float nearZ, float farZ)
{
float ral = right + left;
float rsl = right - left;
@@ -634,7 +632,7 @@ static const char* opengl_get_fragment_shader_code(enum AVPixelFormat format)
return NULL;
}
-static av_always_inline int opengl_type_size(GLenum type)
+static int opengl_type_size(GLenum type)
{
switch(type) {
case GL_UNSIGNED_SHORT: