From: Sebastian Dröge <sebastian.droege@collabora.co.uk>
Date: Fri, 1 Apr 2011 09:33:54 +0000 (+0200)
Subject: videomixer[2]: Use orc_memset() instead of memset()
X-Git-Tag: RELEASE-0.10.29~489
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ce66aea7b08a9e1243fc59f7f4de258753291e16;p=platform%2Fupstream%2Fgst-plugins-good.git

videomixer[2]: Use orc_memset() instead of memset()
---

diff --git a/gst/videomixer/videomixer.c b/gst/videomixer/videomixer.c
index c7bc22404..7ab1de9cb 100644
--- a/gst/videomixer/videomixer.c
+++ b/gst/videomixer/videomixer.c
@@ -89,6 +89,12 @@
 #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;
diff --git a/gst/videomixer/videomixer2.c b/gst/videomixer/videomixer2.c
index 049f0afd5..e7f6ba857 100644
--- a/gst/videomixer/videomixer2.c
+++ b/gst/videomixer/videomixer2.c
@@ -93,6 +93,12 @@
 
 #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 */