summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2004-03-13 00:19:26 +0000
committerDavid Schleef <ds@schleef.org>2004-03-13 00:19:26 +0000
commit661276eb4f7b6aecaa02c7f1583fdd95240ae22f (patch)
tree07460403b7a13c119c289016a85fec4919d03f6f
parent81206cbc7c566e4de2fb692c2e0eb504dea4b34d (diff)
configure.ac: the Hermes library controls hermescolorspace, not colorspace.
Original commit message from CVS: * configure.ac: the Hermes library controls hermescolorspace, not colorspace. * ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_base_init), (gst_mpeg2dec_init): minor pet peeve: disable code with #ifdef, not /* */ * ext/sdl/sdlvideosink.c: Change XID to unsigned long. * ext/sdl/sdlvideosink.h: ditto. * gst/colorspace/gstcolorspace.c: Fix old comments about Hermes
-rw-r--r--ChangeLog13
-rw-r--r--configure.ac2
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 83530a48..e206116e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-03-12 David Schleef <ds@schleef.org>
+
+ * configure.ac: the Hermes library controls hermescolorspace, not
+ colorspace.
+ * ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_base_init),
+ (gst_mpeg2dec_init): minor pet peeve: disable code with #ifdef,
+ not /* */
+ * ext/sdl/sdlvideosink.c: Change XID to unsigned long.
+ * ext/sdl/sdlvideosink.h: ditto.
+ * gst/colorspace/gstcolorspace.c: Fix old comments about Hermes
+
2004-03-12 Benjamin Otte <otte@gnome.org>
* gst-libs/gst/xoverlay/xoverlay.c: (gst_x_overlay_set_xwindow_id),
@@ -89,7 +100,7 @@
2004-03-09 David Schleef <ds@schleef.org>
* ext/alsa/gstalsa.c: (gst_alsa_request_new_pad),
- (gst_alsa_fixate): Add fixate function. (bug #135719)
+ (gst_alsa_fixate): Add fixate function. (bug #136686)
* ext/alsa/gstalsa.h:
* ext/alsa/gstalsasink.c: (gst_alsa_sink_init):
diff --git a/configure.ac b/configure.ac
index 212ed6a1..1c4adb74 100644
--- a/configure.ac
+++ b/configure.ac
@@ -913,7 +913,7 @@ GST_CHECK_FEATURE(GSM, [GSM library], gsmenc gsmdec, [
dnl *** Hermes ***
translit(dnm, m, l) AM_CONDITIONAL(USE_HERMES, true)
-GST_CHECK_FEATURE(HERMES, [Hermes library], colorspace, [
+GST_CHECK_FEATURE(HERMES, [Hermes library], hermescolorspace, [
GST_CHECK_LIBHEADER(HERMES, Hermes, Hermes_ConverterInstance, , Hermes/Hermes.h, HERMES_LIBS="-lHermes")
], AC_SUBST(HERMES_LIBS))