[MOVED FROM BAD 05/68] configure.ac: the Hermes library controls hermescolorspace...

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

diff --git a/gst/colorspace/gstcolorspace.c b/gst/colorspace/gstcolorspace.c
index eaf7908..db4056e 100644 (file)
--- 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",