[FFmpeg-cvslog] lavd/opengl_enc: remove inlines
Lukasz Marek
git at videolan.org
Sun Feb 2 02:48:57 CET 2014
ffmpeg | branch: master | Lukasz Marek <lukasz.m.luki at gmail.com> | Sun Feb 2 02:26:02 2014 +0100| [5059d8dfe3c8c04b3fbdc266ac87305a2bbbf5e1] | committer: Lukasz Marek
lavd/opengl_enc: remove inlines
Signed-off-by: Lukasz Marek <lukasz.m.luki at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5059d8dfe3c8c04b3fbdc266ac87305a2bbbf5e1
---
libavdevice/opengl_enc.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/libavdevice/opengl_enc.c b/libavdevice/opengl_enc.c
index d4516a3..207fbd0 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:
More information about the ffmpeg-cvslog
mailing list