diff options
| author | David Schleef <ds@schleef.org> | 2004-03-13 00:19:26 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2004-03-13 00:19:26 +0000 |
| commit | 3f3b17d2a32096708dadc24eb974a51917e65979 (patch) | |
| tree | d4a97b0b07c4db2fb9f24c6433cb2dae62c7d8d8 /ext | |
| parent | 10575d1a7e4abd08d6b7d628c742ce2cb6d3d213 (diff) | |
| download | gst-plugins-bad-3f3b17d2a32096708dadc24eb974a51917e65979.tar.gz gst-plugins-bad-3f3b17d2a32096708dadc24eb974a51917e65979.tar.bz2 gst-plugins-bad-3f3b17d2a32096708dadc24eb974a51917e65979.zip | |
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
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/sdl/sdlvideosink.c | 5 | ||||
| -rw-r--r-- | ext/sdl/sdlvideosink.h | 2 |
2 files changed, 4 insertions, 3 deletions
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; |