Merge remote-tracking branch 'origin/0.10'

[platform/upstream/gst-plugins-good.git] / gst / shapewipe / gstshapewipe.h

diff --git a/gst/shapewipe/gstshapewipe.h b/gst/shapewipe/gstshapewipe.h
index 2cc4483..1df8c5e 100644 (file)
--- a/gst/shapewipe/gstshapewipe.h
+++ b/gst/shapewipe/gstshapewipe.h
@@ -1,5 +1,5 @@
 /* GStreamer
- * Copyright (C) 2009 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+ * Copyright (C) 2009,2010 Sebastian Dröge <sebastian.droege@collabora.co.uk>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -55,11 +55,14 @@ struct _GstShapeWipe
   GstBuffer *mask;
   gfloat mask_position;
   gfloat mask_border;
-  GMutex *mask_mutex;
-  GCond *mask_cond;
+  GMutex mask_mutex;
+  GCond mask_cond;
   gint mask_bpp;
 
-  gint width, height;
+  GstVideoInfo vinfo;
+  GstVideoInfo minfo;
+
+  gboolean shutdown;
 
   gdouble proportion;
   GstClockTime earliest_time;