videobox: prefix orc functions with video_box_orc_

diff --git a/gst/videobox/gstvideobox.c b/gst/videobox/gstvideobox.c
index 506e91e..94a8d13 100644 (file)
--- a/gst/videobox/gstvideobox.c
+++ b/gst/videobox/gstvideobox.c
@@ -161,10 +161,10 @@ fill_ayuv (GstVideoBoxFill fill_type, guint b_alpha,
   stride = GST_VIDEO_FRAME_PLANE_STRIDE (frame, 0);
 
   if (G_LIKELY (stride == 4 * width))
-    orc_splat_u32 ((guint32 *) dest, empty_pixel, width * height);
+    video_box_orc_splat_u32 ((guint32 *) dest, empty_pixel, width * height);
   else if (height) {
     for (; height; --height) {
-      orc_splat_u32 ((guint32 *) dest, empty_pixel, width);
+      video_box_orc_splat_u32 ((guint32 *) dest, empty_pixel, width);
       dest += stride;
     }
   }
@@ -1786,10 +1786,10 @@ fill_rgb32 (GstVideoBoxFill fill_type, guint b_alpha,
       (rgb_colors_B[fill_type] << (p[3] * 8)));
 
   if (stride == width * 4) {
-    orc_splat_u32 ((guint32 *) dest, empty_pixel, width * height);
+    video_box_orc_splat_u32 ((guint32 *) dest, empty_pixel, width * height);
   } else if (height) {
     for (; height; --height) {
-      orc_splat_u32 ((guint32 *) dest, empty_pixel, width);
+      video_box_orc_splat_u32 ((guint32 *) dest, empty_pixel, width);
       dest += stride;
     }
   }

diff --git a/gst/videobox/gstvideoboxorc-dist.c b/gst/videobox/gstvideoboxorc-dist.c
index 1e00246..eb75624 100644 (file)
--- a/gst/videobox/gstvideoboxorc-dist.c
+++ b/gst/videobox/gstvideoboxorc-dist.c
@@ -82,7 +82,7 @@ typedef union
 #ifndef DISABLE_ORC
 #include <orc/orc.h>
 #endif
-void orc_splat_u32 (guint32 * ORC_RESTRICT d1, int p1, int n);
+void video_box_orc_splat_u32 (guint32 * ORC_RESTRICT d1, int p1, int n);
 
 
 /* begin Orc C target preamble */
@@ -129,10 +129,10 @@ void orc_splat_u32 (guint32 * ORC_RESTRICT d1, int p1, int n);
 
 
 
-/* orc_splat_u32 */
+/* video_box_orc_splat_u32 */
 #ifdef DISABLE_ORC
 void
-orc_splat_u32 (guint32 * ORC_RESTRICT d1, int p1, int n)
+video_box_orc_splat_u32 (guint32 * ORC_RESTRICT d1, int p1, int n)
 {
   int i;
   orc_union32 *ORC_RESTRICT ptr0;
@@ -155,7 +155,7 @@ orc_splat_u32 (guint32 * ORC_RESTRICT d1, int p1, int n)
 
 #else
 static void
-_backup_orc_splat_u32 (OrcExecutor * ORC_RESTRICT ex)
+_backup_video_box_orc_splat_u32 (OrcExecutor * ORC_RESTRICT ex)
 {
   int i;
   int n = ex->n;
@@ -178,7 +178,7 @@ _backup_orc_splat_u32 (OrcExecutor * ORC_RESTRICT ex)
 }
 
 void
-orc_splat_u32 (guint32 * ORC_RESTRICT d1, int p1, int n)
+video_box_orc_splat_u32 (guint32 * ORC_RESTRICT d1, int p1, int n)
 {
   OrcExecutor _ex, *ex = &_ex;
   static volatile int p_inited = 0;
@@ -190,8 +190,8 @@ orc_splat_u32 (guint32 * ORC_RESTRICT d1, int p1, int n)
     if (!p_inited) {
 
       p = orc_program_new ();
-      orc_program_set_name (p, "orc_splat_u32");
-      orc_program_set_backup_function (p, _backup_orc_splat_u32);
+      orc_program_set_name (p, "video_box_orc_splat_u32");
+      orc_program_set_backup_function (p, _backup_video_box_orc_splat_u32);
       orc_program_add_destination (p, 4, "d1");
       orc_program_add_parameter (p, 4, "p1");
 

diff --git a/gst/videobox/gstvideoboxorc-dist.h b/gst/videobox/gstvideoboxorc-dist.h
index 1a711a5..397d3a4 100644 (file)
--- a/gst/videobox/gstvideoboxorc-dist.h
+++ b/gst/videobox/gstvideoboxorc-dist.h
@@ -67,7 +67,7 @@ typedef union { orc_int64 i; double f; orc_int32 x2[2]; float x2f[2]; orc_int16
 #define ORC_RESTRICT
 #endif
 #endif
-void orc_splat_u32 (guint32 * ORC_RESTRICT d1, int p1, int n);
+void video_box_orc_splat_u32 (guint32 * ORC_RESTRICT d1, int p1, int n);
 
 #ifdef __cplusplus
 }

diff --git a/gst/videobox/gstvideoboxorc.orc b/gst/videobox/gstvideoboxorc.orc
index 30abfb1..1dbf9e7 100644 (file)
--- a/gst/videobox/gstvideoboxorc.orc
+++ b/gst/videobox/gstvideoboxorc.orc
@@ -1,5 +1,5 @@
 
-.function orc_splat_u32
+.function video_box_orc_splat_u32
 .dest 4 d1 guint32
 .param 4 p1