From 3a2f40e1602dc55b708f54e9679deaa42faafb55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Mon, 14 Jun 2010 14:47:47 +0200
Subject: [PATCH] legacyresample: Don't include liboil headers, they're not
 used anyway

---
 gst/legacyresample/Makefile.am          | 4 ++--
 gst/legacyresample/resample.c           | 2 --
 gst/legacyresample/resample_functable.c | 1 -
 gst/legacyresample/resample_ref.c       | 1 -
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/gst/legacyresample/Makefile.am b/gst/legacyresample/Makefile.am
index ba440f59de..b29d76bc93 100644
--- a/gst/legacyresample/Makefile.am
+++ b/gst/legacyresample/Makefile.am
@@ -15,8 +15,8 @@ noinst_HEADERS = \
 	buffer.h
 
 libgstlegacyresample_la_SOURCES = gstlegacyresample.c $(resample_SOURCES)
-libgstlegacyresample_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LIBOIL_CFLAGS)
-libgstlegacyresample_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(LIBOIL_LIBS)
+libgstlegacyresample_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
+libgstlegacyresample_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
 libgstlegacyresample_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstlegacyresample_la_LIBTOOLFLAGS = --tag=disable-static
 
diff --git a/gst/legacyresample/resample.c b/gst/legacyresample/resample.c
index f8f229fd5d..0de6524dbf 100644
--- a/gst/legacyresample/resample.c
+++ b/gst/legacyresample/resample.c
@@ -27,7 +27,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
-#include <liboil/liboil.h>
 
 #include "resample.h"
 #include "buffer.h"
@@ -41,7 +40,6 @@ resample_init (void)
   static int inited = 0;
 
   if (!inited) {
-    oil_init ();
     inited = 1;
     GST_DEBUG_CATEGORY_INIT (libaudioresample_debug, "libaudioresample", 0,
         "audio resampling library");
diff --git a/gst/legacyresample/resample_functable.c b/gst/legacyresample/resample_functable.c
index af12427617..f91ad09cf6 100644
--- a/gst/legacyresample/resample_functable.c
+++ b/gst/legacyresample/resample_functable.c
@@ -27,7 +27,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
-#include <liboil/liboil.h>
 
 #include "resample.h"
 #include "buffer.h"
diff --git a/gst/legacyresample/resample_ref.c b/gst/legacyresample/resample_ref.c
index bb8d2411f8..ae6da9a1c7 100644
--- a/gst/legacyresample/resample_ref.c
+++ b/gst/legacyresample/resample_ref.c
@@ -27,7 +27,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
-#include <liboil/liboil.h>
 
 #include "resample.h"
 #include "buffer.h"