From 4b0fe4828758bf406f2ed89fff4832a93b19e397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Fri, 8 Sep 2006 11:04:24 +0000
Subject: [PATCH] gst/videocrop/: Some quick tests indicate that it doesn't
 make a great deal of sense to use liboil here, at least not...

Original commit message from CVS:
* gst/videocrop/Makefile.am:
* gst/videocrop/gstvideocrop.c: (gst_video_crop_class_init),
(gst_video_crop_transform_packed),
(gst_video_crop_transform_planar):
Some quick tests indicate that it doesn't make a great deal
of sense to use liboil here, at least not for the memcpy()s
we do, so remove liboil usage until there is clear evidence
it actually makes a positive difference somewhere.
---
 gst/videocrop/Makefile.am    |  4 ++--
 gst/videocrop/gstvideocrop.c | 11 ++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/gst/videocrop/Makefile.am b/gst/videocrop/Makefile.am
index f5634bdf52..9557742c9b 100644
--- a/gst/videocrop/Makefile.am
+++ b/gst/videocrop/Makefile.am
@@ -5,8 +5,8 @@ plugin_LTLIBRARIES = libgstvideocrop.la
 
 libgstvideocrop_la_SOURCES = gstvideocrop.c
 libgstvideocrop_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
-	$(GST_PLUGINS_BASE_CFLAGS) $(LIBOIL_CFLAGS)
-libgstvideocrop_la_LIBADD = $(GST_BASE_LIBS) $(LIBOIL_LIBS)
+	$(GST_PLUGINS_BASE_CFLAGS)
+libgstvideocrop_la_LIBADD = $(GST_BASE_LIBS)
 libgstvideocrop_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = gstvideocrop.h
diff --git a/gst/videocrop/gstvideocrop.c b/gst/videocrop/gstvideocrop.c
index 55adf01be5..c5b0ac9004 100644
--- a/gst/videocrop/gstvideocrop.c
+++ b/gst/videocrop/gstvideocrop.c
@@ -61,7 +61,6 @@
 
 #include "gstvideocrop.h"
 
-#include <liboil/liboil.h>
 #include <string.h>
 
 GST_DEBUG_CATEGORY_STATIC (videocrop_debug);
@@ -178,8 +177,6 @@ gst_video_crop_class_init (GstVideoCropClass * klass)
       GST_DEBUG_FUNCPTR (gst_video_crop_get_unit_size);
 
   basetransform_class->passthrough_on_same_caps = TRUE;
-
-  oil_init ();
 }
 
 static void
@@ -317,7 +314,7 @@ gst_video_crop_transform_packed (GstVideoCrop * vcrop, GstBuffer * inbuf,
   dx = vcrop->out.width * vcrop->out.bytes_per_pixel;
 
   for (i = 0; i < vcrop->out.height; ++i) {
-    oil_memcpy (out_data, in_data, dx);
+    memcpy (out_data, in_data, dx);
     in_data += vcrop->in.stride;
     out_data += vcrop->out.stride;
   }
@@ -339,7 +336,7 @@ gst_video_crop_transform_planar (GstVideoCrop * vcrop, GstBuffer * inbuf,
   dx = vcrop->out.width * 1;
 
   for (i = 0; i < vcrop->out.height; ++i) {
-    oil_memcpy (y_out, y_in, dx);
+    memcpy (y_out, y_in, dx);
     y_in += vcrop->in.y_stride;
     y_out += vcrop->out.y_stride;
   }
@@ -360,8 +357,8 @@ gst_video_crop_transform_planar (GstVideoCrop * vcrop, GstBuffer * inbuf,
   dx = GST_ROUND_UP_2 (vcrop->out.width) / 2;
 
   for (i = 0; i < GST_ROUND_UP_2 (vcrop->out.height) / 2; ++i) {
-    oil_memcpy (u_out, u_in, dx);
-    oil_memcpy (v_out, v_in, dx);
+    memcpy (u_out, u_in, dx);
+    memcpy (v_out, v_in, dx);
     u_in += vcrop->in.u_stride;
     u_out += vcrop->out.u_stride;
     v_in += vcrop->in.v_stride;