videomixer[2]: Use orc_memset() instead of memset()
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Fri, 1 Apr 2011 09:33:54 +0000 (11:33 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Fri, 1 Apr 2011 09:35:26 +0000 (11:35 +0200)
gst/videomixer/videomixer.c
gst/videomixer/videomixer2.c

index c7bc224..7ab1de9 100644 (file)
 #include "videomixer.h"
 #include "videomixer2.h"
 
+#ifdef DISABLE_ORC
+#define orc_memset memset
+#else
+#include <orc/orcfunctions.h>
+#endif
+
 GST_DEBUG_CATEGORY_STATIC (gst_videomixer_debug);
 #define GST_CAT_DEFAULT gst_videomixer_debug
 
@@ -1610,7 +1616,7 @@ gst_videomixer_collected (GstCollectPads * pads, GstVideoMixer * mix)
           mix->out_height, 240, 128, 128);
       break;
     case VIDEO_MIXER_BACKGROUND_TRANSPARENT:
-      memset (GST_BUFFER_DATA (outbuf), 0,
+      orc_memset (GST_BUFFER_DATA (outbuf), 0,
           gst_video_format_get_row_stride (mix->fmt, 0,
               mix->out_width) * mix->out_height);
       break;
index 049f0af..e7f6ba8 100644 (file)
 
 #include <gst/controller/gstcontroller.h>
 
+#ifdef DISABLE_ORC
+#define orc_memset memset
+#else
+#include <orc/orcfunctions.h>
+#endif
+
 GST_DEBUG_CATEGORY_STATIC (gst_videomixer2_debug);
 #define GST_CAT_DEFAULT gst_videomixer2_debug
 
@@ -838,7 +844,7 @@ gst_videomixer2_blend_buffers (GstVideoMixer2 * mix,
           mix->height, 240, 128, 128);
       break;
     case VIDEO_MIXER2_BACKGROUND_TRANSPARENT:
-      memset (GST_BUFFER_DATA (*outbuf), 0,
+      orc_memset (GST_BUFFER_DATA (*outbuf), 0,
           gst_video_format_get_row_stride (mix->format, 0,
               mix->width) * mix->height);
       /* use overlay to keep background transparent */