From 3f2421c8a66a14310bbd94261bb13ac44939e911 Mon Sep 17 00:00:00 2001
From: Christoph Burghardt <hawkes@web.de>
Date: Fri, 20 Jan 2006 15:06:28 +0000
Subject: [PATCH] gst/videobox/gstvideobox.c: Don't forget to initialize
 liboil, otherwise our oil functions

Original commit message from CVS:
* gst/videobox/gstvideobox.c: (gst_video_box_class_init):
Don't forget to initialize liboil, otherwise our oil functions
will crash (fixes #327871; patch by: Christoph Burghardt
<hawkes at web dot de>).
---
 ChangeLog                  | 7 +++++++
 common                     | 2 +-
 gst/videobox/gstvideobox.c | 2 --
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b1d820194c..db23543771 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-20  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/videobox/gstvideobox.c: (gst_video_box_class_init):
+	  Don't forget to initialize liboil, otherwise our oil functions
+	  will crash (fixes #327871; patch by: Christoph Burghardt
+	  <hawkes at web dot de>).
+
 2006-01-19  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* configure.ac:
diff --git a/common b/common
index e0b121388e..5b72280d9c 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit e0b121388ece524c0b7035a72bddd191d122d8bf
+Subproject commit 5b72280d9ce34e312924e2c4831ed21c26f885eb
diff --git a/gst/videobox/gstvideobox.c b/gst/videobox/gstvideobox.c
index 76ee14a35f..85e023bfbd 100644
--- a/gst/videobox/gstvideobox.c
+++ b/gst/videobox/gstvideobox.c
@@ -220,9 +220,7 @@ gst_video_box_class_init (GstVideoBoxClass * klass)
   GST_DEBUG_CATEGORY_INIT (videobox_debug, "videobox", 0,
       "Resizes a video by adding borders or cropping");
 
-#ifdef HAVE_LIBOIL
   oil_init ();
-#endif
 }
 
 static void