From c01f7aee1dd1e3e4b03bd9b23b6927ed8cc7cd1f Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Thu, 15 Jan 2004 11:02:02 +0000 Subject: ext/hermes/gsthermescolorspace.c: Fix another compile error. Same as below. Original commit message from CVS: 2004-01-15 Ronald Bultje * ext/hermes/gsthermescolorspace.c: Fix another compile error. Same as below. --- ext/hermes/gsthermescolorspace.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) (limited to 'ext/hermes') 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 -- cgit v1.2.1