From 3f3b17d2a32096708dadc24eb974a51917e65979 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Sat, 13 Mar 2004 00:19:26 +0000 Subject: 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 --- ext/sdl/sdlvideosink.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'ext/sdl/sdlvideosink.c') diff --git a/ext/sdl/sdlvideosink.c b/ext/sdl/sdlvideosink.c index aada0eb3..57547102 100644 --- a/ext/sdl/sdlvideosink.c +++ b/ext/sdl/sdlvideosink.c @@ -51,7 +51,7 @@ static gboolean gst_sdlvideosink_supported (GstImplementsInterface *iface, static void gst_sdlvideosink_xoverlay_init (GstXOverlayClass *klass); static void gst_sdlvideosink_xoverlay_set_xwindow_id (GstXOverlay *overlay, - XID parent); + unsigned long parent); static gboolean gst_sdlvideosink_lock (GstSDLVideoSink *sdl); static void gst_sdlvideosink_unlock (GstSDLVideoSink *sdl); @@ -321,7 +321,8 @@ gst_sdlvideosink_xoverlay_init (GstXOverlayClass *klass) } static void -gst_sdlvideosink_xoverlay_set_xwindow_id (GstXOverlay *overlay, XID parent) +gst_sdlvideosink_xoverlay_set_xwindow_id (GstXOverlay *overlay, + unsigned long parent) { GstSDLVideoSink *sdlvideosink = GST_SDLVIDEOSINK (overlay); -- cgit v1.2.1