summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/hermes/gsthermescolorspace.c38
2 files changed, 29 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 0467b3dc..a3744d97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2004-01-15 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ * ext/hermes/gsthermescolorspace.c:
+ Fix another compile error. Same as below.
+
+2004-01-15 Ronald Bultje <rbultje@ronald.bitfreak.net>
+
* gst/colorspace/gstcolorspace.c:
* gst/colorspace/yuv2yuv.c: (gst_colorspace_yuy2_to_i420),
(gst_colorspace_i420_to_yv12):
diff --git a/ext/hermes/gsthermescolorspace.c b/ext/hermes/gsthermescolorspace.c
index c42ef7c6..f2d17471 100644
--- a/ext/hermes/gsthermescolorspace.c
+++ b/ext/hermes/gsthermescolorspace.c
@@ -84,10 +84,14 @@ typedef struct _GstHermesColorspaceFormat {
} GstHermesColorspaceFormat;
static GstHermesColorspaceFormat gst_hermes_colorspace_formats[] = {
- { GST_STATIC_CAPS (GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_24_32_REVERSE) },
- { GST_STATIC_CAPS (GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_24_32) },
- { GST_STATIC_CAPS (GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_15) },
- { GST_STATIC_CAPS (GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_16) },
+ { GST_STATIC_CAPS (GST_VIDEO_CAPS_xRGB) },
+ { GST_STATIC_CAPS (GST_VIDEO_CAPS_RGBx) },
+ { GST_STATIC_CAPS (GST_VIDEO_CAPS_BGRx) },
+ { GST_STATIC_CAPS (GST_VIDEO_CAPS_xBGR) },
+ { GST_STATIC_CAPS (GST_VIDEO_CAPS_BGR) },
+ { GST_STATIC_CAPS (GST_VIDEO_CAPS_RGB) },
+ { GST_STATIC_CAPS (GST_VIDEO_CAPS_RGB_15) },
+ { GST_STATIC_CAPS (GST_VIDEO_CAPS_RGB_16) },
};
static GstElementDetails colorspace_details = {
@@ -462,11 +466,14 @@ GST_STATIC_PAD_TEMPLATE (
GST_PAD_SRC,
GST_PAD_ALWAYS,
GST_STATIC_CAPS (
- GST_VIDEO_YUV_PAD_TEMPLATE_CAPS ("{ I420, YV12, YUY2 }") "; "
- GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_24_32_REVERSE "; "
- GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_24_32 "; "
- GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_15 "; "
- GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_16)
+ GST_VIDEO_CAPS_xRGB "; "
+ GST_VIDEO_CAPS_RGBx "; "
+ GST_VIDEO_CAPS_BGRx "; "
+ GST_VIDEO_CAPS_xBGR "; "
+ GST_VIDEO_CAPS_BGR "; "
+ GST_VIDEO_CAPS_RGB "; "
+ GST_VIDEO_CAPS_RGB_16 "; "
+ GST_VIDEO_CAPS_RGB_15)
);
static GstStaticPadTemplate gst_hermes_colorspace_sink_pad_template =
@@ -475,11 +482,14 @@ GST_STATIC_PAD_TEMPLATE (
GST_PAD_SINK,
GST_PAD_ALWAYS,
GST_STATIC_CAPS (
- GST_VIDEO_YUV_PAD_TEMPLATE_CAPS ("{ I420, YV12, YUY2 }") "; "
- GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_24_32_REVERSE "; "
- GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_24_32 "; "
- GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_15 "; "
- GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_16)
+ GST_VIDEO_CAPS_xRGB "; "
+ GST_VIDEO_CAPS_RGBx "; "
+ GST_VIDEO_CAPS_BGRx "; "
+ GST_VIDEO_CAPS_xBGR "; "
+ GST_VIDEO_CAPS_BGR "; "
+ GST_VIDEO_CAPS_RGB "; "
+ GST_VIDEO_CAPS_RGB_16 "; "
+ GST_VIDEO_CAPS_RGB_15)
);
static void