Merge branch 'master' into 0.11

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

diff --git a/gst/shapewipe/gstshapewipe.h b/gst/shapewipe/gstshapewipe.h
index 2cc4483..296ef59 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
@@ -59,7 +59,9 @@ struct _GstShapeWipe
   GCond *mask_cond;
   gint mask_bpp;
 
-  gint width, height;
+  GstVideoInfo info;
+
+  gboolean shutdown;
 
   gdouble proportion;
   GstClockTime earliest_time;