summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Burghardt <hawkes@web.de>2006-01-20 15:06:28 +0000
committerTim-Philipp Müller <tim@centricular.net>2006-01-20 15:06:28 +0000
commit3f2421c8a66a14310bbd94261bb13ac44939e911 (patch)
tree0af1ecc9f1d1c19308d0df61bb36df444f088307
parent7d437d6c760522d4303ffda5ab69e123f6203f39 (diff)
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>).
-rw-r--r--ChangeLog7
m---------common0
-rw-r--r--gst/videobox/gstvideobox.c2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b1d82019..db235437 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
-Subproject e0b121388ece524c0b7035a72bddd191d122d8b
+Subproject 5b72280d9ce34e312924e2c4831ed21c26f885e
diff --git a/gst/videobox/gstvideobox.c b/gst/videobox/gstvideobox.c
index 76ee14a3..85e023bf 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