mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure.ac: the Hermes library controls hermescolorspace, not colorspace.

Browse source 
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
This commit is contained in:
David Schleef 2004-03-13 00:19:26 +00:00
parent 10575d1a7e
commit 3f3b17d2a3
5 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -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> 2004-03-12 Benjamin Otte <otte@gnome.org>
* gst-libs/gst/xoverlay/xoverlay.c: (gst_x_overlay_set_xwindow_id), * gst-libs/gst/xoverlay/xoverlay.c: (gst_x_overlay_set_xwindow_id),
@ -89,7 +100,7 @@
2004-03-09 David Schleef <ds@schleef.org> 2004-03-09 David Schleef <ds@schleef.org>
* ext/alsa/gstalsa.c: (gst_alsa_request_new_pad), * 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/gstalsa.h:
* ext/alsa/gstalsasink.c: (gst_alsa_sink_init): * ext/alsa/gstalsasink.c: (gst_alsa_sink_init):

2
configure.ac
View file

@ -913,7 +913,7 @@ GST_CHECK_FEATURE(GSM, [GSM library], gsmenc gsmdec, [
dnl *** Hermes *** dnl *** Hermes ***
translit(dnm, m, l) AM_CONDITIONAL(USE_HERMES, true) 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") GST_CHECK_LIBHEADER(HERMES, Hermes, Hermes_ConverterInstance, , Hermes/Hermes.h, HERMES_LIBS="-lHermes")
], AC_SUBST(HERMES_LIBS)) ], AC_SUBST(HERMES_LIBS))

5
ext/sdl/sdlvideosink.c
View file

@ -51,7 +51,7 @@ static gboolean gst_sdlvideosink_supported (GstImplementsInterface *iface,
static void gst_sdlvideosink_xoverlay_init (GstXOverlayClass *klass); static void gst_sdlvideosink_xoverlay_init (GstXOverlayClass *klass);
static void gst_sdlvideosink_xoverlay_set_xwindow_id static void gst_sdlvideosink_xoverlay_set_xwindow_id
(GstXOverlay *overlay, (GstXOverlay *overlay,
XID parent); unsigned long parent);
static gboolean gst_sdlvideosink_lock (GstSDLVideoSink *sdl); static gboolean gst_sdlvideosink_lock (GstSDLVideoSink *sdl);
static void gst_sdlvideosink_unlock (GstSDLVideoSink *sdl); static void gst_sdlvideosink_unlock (GstSDLVideoSink *sdl);
@ -321,7 +321,8 @@ gst_sdlvideosink_xoverlay_init (GstXOverlayClass *klass)
} }
static void 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); GstSDLVideoSink *sdlvideosink = GST_SDLVIDEOSINK (overlay);

2
ext/sdl/sdlvideosink.h
View file

@ -51,7 +51,7 @@ struct _GstSDLVideoSink {
guint32 format; guint32 format;
gint width, height; /* the size of the incoming YUV stream */ gint width, height; /* the size of the incoming YUV stream */
XID xwindow_id; unsigned long xwindow_id;
gboolean init; gboolean init;

3
gst/colorspace/gstcolorspace.c
View file

@ -66,6 +66,7 @@ GST_STATIC_PAD_TEMPLATE (
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ( GST_STATIC_CAPS (
GST_VIDEO_CAPS_xRGB "; " GST_VIDEO_CAPS_xRGB "; "
GST_VIDEO_CAPS_BGRx "; "
GST_VIDEO_CAPS_RGB "; " GST_VIDEO_CAPS_RGB "; "
GST_VIDEO_CAPS_RGB_16 GST_VIDEO_CAPS_RGB_16
) )
@ -627,7 +628,7 @@ GST_PLUGIN_DEFINE (
GST_VERSION_MAJOR, GST_VERSION_MAJOR,
GST_VERSION_MINOR, GST_VERSION_MINOR,
"colorspace", "colorspace",
"Hermes colorspace converter", "internal colorspace converter",
plugin_init, plugin_init,
VERSION, VERSION,
"LGPL", "LGPL",