From b144bc6c58979f49a6e8e04a04a65f771247297a Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Mon, 22 Dec 2003 01:47:09 +0000
Subject: Merge CAPS branch

Original commit message from CVS:
Merge CAPS branch
---
 ext/hermes/gstcolorspace.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'ext/hermes/gstcolorspace.h')

diff --git a/ext/hermes/gstcolorspace.h b/ext/hermes/gstcolorspace.h
index ef8a8bfe..0cf6f2d7 100644
--- a/ext/hermes/gstcolorspace.h
+++ b/ext/hermes/gstcolorspace.h
@@ -75,13 +75,12 @@ struct _GstColorspace {
 
   GstColorSpaceConverterType type;
   gint width, height;
-  gfloat fps;
+  gdouble fps;
   gint srcbpp, destbpp;
-  gboolean disabled;
+  gboolean passthru;
 
   GstCaps *sinkcaps;
-
-  GstBufferPool *pool;
+  GstCaps *srccaps;
 };
 
 struct _GstColorspaceClass {
-- 
cgit v1.2.1