gl: Rename gst_gl_get_affine_transformation_meta_as_ndc_ext() to prevent symbol conflict

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.

diff --git a/ext/gl/gstglimagesink.c b/ext/gl/gstglimagesink.c
index 9779aab..2b20b1e 100644 (file)
--- a/ext/gl/gstglimagesink.c
+++ b/ext/gl/gstglimagesink.c
@@ -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);

diff --git a/ext/gl/gstglutils.c b/ext/gl/gstglutils.c
index 224923c..ec18065 100644 (file)
--- a/ext/gl/gstglutils.c
+++ b/ext/gl/gstglutils.c
@@ -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;

diff --git a/ext/gl/gstglutils.h b/ext/gl/gstglutils.h
index 5c9de83..763764e 100644 (file)
--- a/ext/gl/gstglutils.h
+++ b/ext/gl/gstglutils.h
@@ -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

diff --git a/ext/gl/gstglvideomixer.c b/ext/gl/gstglvideomixer.c
index 1c86557..b9ea63e 100644 (file)
--- a/ext/gl/gstglvideomixer.c
+++ b/ext/gl/gstglvideomixer.c
@@ -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);
     }