mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-18 07:47:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl: Rename gst_gl_get_affine_transformation_meta_as_ndc_ext() to prevent symbol conflict

Browse source 
The same symbol also exists in libgstgl, although marked as private and
internal. This has no effect when doing static linking and there's a
symbol conflict.
This commit is contained in:
Sebastian Dröge 2017-02-28 10:53:04 +02:00 committed by Tim-Philipp Müller
parent 108eef7ac7
commit dc28155e21
4 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/gl/gstglimagesink.c
View file

@ -2242,7 +2242,7 @@ gst_glimage_sink_on_draw (GstGLImageSink * gl_sink)
gst_buffer_get_video_affine_transformation_meta
(gl_sink->stored_buffer[0]);
gst_gl_get_affine_transformation_meta_as_ndc (af_meta, matrix);
gst_gl_get_affine_transformation_meta_as_ndc_ext (af_meta, matrix);
if (gl_sink->transform_matrix)
gst_gl_multiply_matrix4 (gl_sink->transform_matrix, matrix, matrix);

5
ext/gl/gstglutils.c
View file

@ -148,9 +148,8 @@ gst_gl_multiply_matrix4 (const gfloat * a, const gfloat * b, gfloat * result)
result[i] = tmp[i];
}
void
gst_gl_get_affine_transformation_meta_as_ndc (GstVideoAffineTransformationMeta *
meta, gfloat * matrix)
void gst_gl_get_affine_transformation_meta_as_ndc_ext
(GstVideoAffineTransformationMeta * meta, gfloat * matrix)
{
if (!meta) {
int i;

2
ext/gl/gstglutils.h
View file

@ -29,7 +29,7 @@ gboolean gst_gl_context_gen_shader (GstGLContext * context,
const gchar * shader_vertex_source,
const gchar * shader_fragment_source, GstGLShader ** shader);
void gst_gl_multiply_matrix4 (const gfloat * a, const gfloat * b, gfloat * result);
void gst_gl_get_affine_transformation_meta_as_ndc (GstVideoAffineTransformationMeta *
void gst_gl_get_affine_transformation_meta_as_ndc_ext (GstVideoAffineTransformationMeta *
meta, gfloat * matrix);
G_END_DECLS

2
ext/gl/gstglvideomixer.c
View file

@ -1535,7 +1535,7 @@ gst_gl_video_mixer_callback (gpointer stuff)
af_meta =
gst_buffer_get_video_affine_transformation_meta (vagg_pad->buffer);
gst_gl_get_affine_transformation_meta_as_ndc (af_meta, matrix);
gst_gl_get_affine_transformation_meta_as_ndc_ext (af_meta, matrix);
gst_gl_shader_set_uniform_matrix_4fv (video_mixer->shader,
"u_transformation", 1, FALSE, matrix);
}