diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | ext/sdl/sdlvideosink.c | 5 | ||||
| -rw-r--r-- | ext/sdl/sdlvideosink.h | 2 | ||||
| -rw-r--r-- | gst/colorspace/gstcolorspace.c | 3 |
5 files changed, 19 insertions, 6 deletions
@@ -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)) 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); diff --git a/ext/sdl/sdlvideosink.h b/ext/sdl/sdlvideosink.h index ea45b654..ad682385 100644 --- a/ext/sdl/sdlvideosink.h +++ b/ext/sdl/sdlvideosink.h @@ -51,7 +51,7 @@ struct _GstSDLVideoSink { guint32 format; gint width, height; /* the size of the incoming YUV stream */ - XID xwindow_id; + unsigned long xwindow_id; gboolean init; diff --git a/gst/colorspace/gstcolorspace.c b/gst/colorspace/gstcolorspace.c index eaf79083..db4056eb 100644 --- a/gst/colorspace/gstcolorspace.c +++ b/gst/colorspace/gstcolorspace.c @@ -66,6 +66,7 @@ GST_STATIC_PAD_TEMPLATE ( GST_PAD_ALWAYS, GST_STATIC_CAPS ( GST_VIDEO_CAPS_xRGB "; " + GST_VIDEO_CAPS_BGRx "; " GST_VIDEO_CAPS_RGB "; " GST_VIDEO_CAPS_RGB_16 ) @@ -627,7 +628,7 @@ GST_PLUGIN_DEFINE ( GST_VERSION_MAJOR, GST_VERSION_MINOR, "colorspace", - "Hermes colorspace converter", + "internal colorspace converter", plugin_init, VERSION, "LGPL", |