summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2004-10-14 23:19:58 +0000
committerDavid Schleef <ds@schleef.org>2004-10-14 23:19:58 +0000
commitcc9a17b757dc2c5f2ae9df05747bc0e3ce36648e (patch)
tree99e9828a199fd2725ff6b7607e750623073d4c31
parentd4ef0029a6fba005565e239598b1fc46dc973048 (diff)
configure.ac: update for swfdec-0.3 and liboil-0.2
Original commit message from CVS: * configure.ac: update for swfdec-0.3 and liboil-0.2 * ext/swfdec/gstswfdec.c: update for swfdec-0.3 * ext/swfdec/gstswfdec.h: same * gst/videofilter/gstvideobalance.c: update for liboil-0.2 * gst/videotestsrc/videotestsrc.c: same
-rw-r--r--ChangeLog8
-rw-r--r--configure.ac4
-rw-r--r--gst/videofilter/gstvideobalance.c4
3 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index dced8fe5..d7eb5311 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-10-14 David Schleef <ds@schleef.org>
+
+ * configure.ac: update for swfdec-0.3 and liboil-0.2
+ * ext/swfdec/gstswfdec.c: update for swfdec-0.3
+ * ext/swfdec/gstswfdec.h: same
+ * gst/videofilter/gstvideobalance.c: update for liboil-0.2
+ * gst/videotestsrc/videotestsrc.c: same
+
2004-10-14 Wim Taymans <wim@fluendo.com>
* gst/tcp/gstmultifdsink.c: (gst_multifdsink_add),
diff --git a/configure.ac b/configure.ac
index d3f36499..0f18f67a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -306,7 +306,7 @@ if test "x$HAVE_GDK_LOADERS" = "xyes"; then
fi
AM_CONDITIONAL(HAVE_GDK_LOADERS, test "x$HAVE_GDK_LOADERS" = "xyes")
-PKG_CHECK_MODULES(LIBOIL, liboil-0.1, HAVE_LIBOIL=yes, HAVE_LIBOIL=no)
+PKG_CHECK_MODULES(LIBOIL, liboil-0.2, HAVE_LIBOIL=yes, HAVE_LIBOIL=no)
AC_SUBST(LIBOIL_CFLAGS)
AC_SUBST(LIBOIL_LIBS)
if test "x${HAVE_LIBOIL}" = xyes ; then
@@ -1490,7 +1490,7 @@ GST_CHECK_FEATURE(SNDFILE, [sndfile plug-in], sfsrc sfsink, [
dnl *** swfdec ***
translit(dnm, m, l) AM_CONDITIONAL(USE_SWFDEC, true)
GST_CHECK_FEATURE(SWFDEC, [swfdec plug-in], swfdec, [
- PKG_CHECK_MODULES(SWFDEC, swfdec >= 0.1.3.1, HAVE_SWFDEC=yes, HAVE_SWFDEC=no)
+ PKG_CHECK_MODULES(SWFDEC, swfdec-0.3 >= 0.3.0, HAVE_SWFDEC=yes, HAVE_SWFDEC=no)
AC_SUBST(SWFDEC_CFLAGS)
AC_SUBST(SWFDEC_LIBS)
])
diff --git a/gst/videofilter/gstvideobalance.c b/gst/videofilter/gstvideobalance.c
index 66e45d12..9ce55252 100644
--- a/gst/videofilter/gstvideobalance.c
+++ b/gst/videofilter/gstvideobalance.c
@@ -487,7 +487,7 @@ gst_videobalance_update_tables_planar411 (GstVideobalance * vb)
#ifndef HAVE_LIBOIL
void
-tablelookup_u8 (guint8 * dest, int dstr, guint8 * src, int sstr,
+oil_tablelookup_u8 (guint8 * dest, int dstr, guint8 * src, int sstr,
guint8 * table, int tstr, int n)
{
int i;
@@ -524,7 +524,7 @@ gst_videobalance_planar411 (GstVideofilter * videofilter, void *dest, void *src)
guint8 *csrc = src;
for (y = 0; y < height; y++) {
- tablelookup_u8 (cdest + y * width, 1, csrc + y * width, 1,
+ oil_tablelookup_u8 (cdest + y * width, 1, csrc + y * width, 1,
videobalance->tabley, 1, width);
}
}