Merge ad-hoc release branch '0.10.28'

3 files changed, 134 insertions, 4 deletions

diff --git a/win32/common/config.h b/win32/common/config.h
index 8abfbb58d..84520c479 100644
--- a/win32/common/config.h
+++ b/win32/common/config.h
@@ -49,7 +49,7 @@
 #define GST_PACKAGE_ORIGIN "Unknown package origin"
 
 /* GStreamer package release date/time for plugins as YYYY-MM-DD */
-#define GST_PACKAGE_RELEASE_DATETIME "2011-01-27T15:30Z"
+#define GST_PACKAGE_RELEASE_DATETIME "2011-03-08T16:22Z"
 
 /* struct v4l2_buffer missing */
 #undef GST_V4L2_MISSING_BUFDECL
@@ -72,6 +72,10 @@
 /* Define to enable Cairo graphics rendering (used by cairo). */
 #undef HAVE_CAIRO
 
+/* Define to enable Cairo graphics rendering gobject bindings (used by
+   cairooverlay). */
+#undef HAVE_CAIRO_GOBJECT
+
 /* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
    CoreFoundation framework. */
 #undef HAVE_CFLOCALECOPYCURRENT
@@ -386,7 +390,7 @@
 #define PACKAGE_NAME "GStreamer Good Plug-ins"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GStreamer Good Plug-ins 0.10.27.1"
+#define PACKAGE_STRING "GStreamer Good Plug-ins 0.10.28.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "gst-plugins-good"
@@ -395,7 +399,7 @@
 #undef PACKAGE_URL
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.10.27.1"
+#define PACKAGE_VERSION "0.10.28.1"
 
 /* directory where plugins are located */
 #ifdef _DEBUG
@@ -426,7 +430,7 @@
 #undef STDC_HEADERS
 
 /* Version number of package */
-#define VERSION "0.10.27.1"
+#define VERSION "0.10.28.1"
 
 /* old wavpack API */
 #undef WAVPACK_OLD_API
diff --git a/win32/common/gstrtpbin-marshal.c b/win32/common/gstrtpbin-marshal.c
index d52c2baaa..5fae29f3f 100644
--- a/win32/common/gstrtpbin-marshal.c
+++ b/win32/common/gstrtpbin-marshal.c
@@ -321,3 +321,104 @@ gst_rtp_bin_marshal_UINT64__BOOLEAN_UINT64 (GClosure * closure,
 
   g_value_set_uint64 (return_value, v_return);
 }
+
+/* BOOL:POINTER,BOOL (gstrtpbin-marshal.list:10) */
+void
+gst_rtp_bin_marshal_BOOLEAN__POINTER_BOOLEAN (GClosure * closure,
+    GValue * return_value G_GNUC_UNUSED,
+    guint n_param_values,
+    const GValue * param_values,
+    gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__POINTER_BOOLEAN) (gpointer data1,
+      gpointer arg_1, gboolean arg_2, gpointer data2);
+  register GMarshalFunc_BOOLEAN__POINTER_BOOLEAN callback;
+  register GCClosure *cc = (GCClosure *) closure;
+  register gpointer data1, data2;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure)) {
+    data1 = closure->data;
+    data2 = g_value_peek_pointer (param_values + 0);
+  } else {
+    data1 = g_value_peek_pointer (param_values + 0);
+    data2 = closure->data;
+  }
+  callback =
+      (GMarshalFunc_BOOLEAN__POINTER_BOOLEAN) (marshal_data ? marshal_data :
+      cc->callback);
+
+  v_return = callback (data1,
+      g_marshal_value_peek_pointer (param_values + 1),
+      g_marshal_value_peek_boolean (param_values + 2), data2);
+
+  g_value_set_boolean (return_value, v_return);
+}
+
+/* VOID:UINT,UINT,UINT,UINT,POINTER (gstrtpbin-marshal.list:11) */
+void
+gst_rtp_bin_marshal_VOID__UINT_UINT_UINT_UINT_POINTER (GClosure * closure,
+    GValue * return_value G_GNUC_UNUSED,
+    guint n_param_values,
+    const GValue * param_values,
+    gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__UINT_UINT_UINT_UINT_POINTER) (gpointer
+      data1, guint arg_1, guint arg_2, guint arg_3, guint arg_4, gpointer arg_5,
+      gpointer data2);
+  register GMarshalFunc_VOID__UINT_UINT_UINT_UINT_POINTER callback;
+  register GCClosure *cc = (GCClosure *) closure;
+  register gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 6);
+
+  if (G_CCLOSURE_SWAP_DATA (closure)) {
+    data1 = closure->data;
+    data2 = g_value_peek_pointer (param_values + 0);
+  } else {
+    data1 = g_value_peek_pointer (param_values + 0);
+    data2 = closure->data;
+  }
+  callback =
+      (GMarshalFunc_VOID__UINT_UINT_UINT_UINT_POINTER) (marshal_data ?
+      marshal_data : cc->callback);
+
+  callback (data1,
+      g_marshal_value_peek_uint (param_values + 1),
+      g_marshal_value_peek_uint (param_values + 2),
+      g_marshal_value_peek_uint (param_values + 3),
+      g_marshal_value_peek_uint (param_values + 4),
+      g_marshal_value_peek_pointer (param_values + 5), data2);
+}
+
+/* VOID:UINT64 (gstrtpbin-marshal.list:12) */
+void
+gst_rtp_bin_marshal_VOID__UINT64 (GClosure * closure,
+    GValue * return_value G_GNUC_UNUSED,
+    guint n_param_values,
+    const GValue * param_values,
+    gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__UINT64) (gpointer data1,
+      guint64 arg_1, gpointer data2);
+  register GMarshalFunc_VOID__UINT64 callback;
+  register GCClosure *cc = (GCClosure *) closure;
+  register gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 2);
+
+  if (G_CCLOSURE_SWAP_DATA (closure)) {
+    data1 = closure->data;
+    data2 = g_value_peek_pointer (param_values + 0);
+  } else {
+    data1 = g_value_peek_pointer (param_values + 0);
+    data2 = closure->data;
+  }
+  callback =
+      (GMarshalFunc_VOID__UINT64) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1, g_marshal_value_peek_uint64 (param_values + 1), data2);
+}
diff --git a/win32/common/gstrtpbin-marshal.h b/win32/common/gstrtpbin-marshal.h
index da33b8fb5..6d25b4412 100644
--- a/win32/common/gstrtpbin-marshal.h
+++ b/win32/common/gstrtpbin-marshal.h
@@ -74,6 +74,31 @@ extern void gst_rtp_bin_marshal_UINT64__BOOLEAN_UINT64 (GClosure     *closure,
                                                         gpointer      marshal_data);
 #define gst_rtp_bin_marshal_UINT64__BOOL_UINT64	gst_rtp_bin_marshal_UINT64__BOOLEAN_UINT64
 
+/* BOOL:POINTER,BOOL (gstrtpbin-marshal.list:10) */
+extern void gst_rtp_bin_marshal_BOOLEAN__POINTER_BOOLEAN (GClosure     *closure,
+                                                          GValue       *return_value,
+                                                          guint         n_param_values,
+                                                          const GValue *param_values,
+                                                          gpointer      invocation_hint,
+                                                          gpointer      marshal_data);
+#define gst_rtp_bin_marshal_BOOL__POINTER_BOOL	gst_rtp_bin_marshal_BOOLEAN__POINTER_BOOLEAN
+
+/* VOID:UINT,UINT,UINT,UINT,POINTER (gstrtpbin-marshal.list:11) */
+extern void gst_rtp_bin_marshal_VOID__UINT_UINT_UINT_UINT_POINTER (GClosure     *closure,
+                                                                   GValue       *return_value,
+                                                                   guint         n_param_values,
+                                                                   const GValue *param_values,
+                                                                   gpointer      invocation_hint,
+                                                                   gpointer      marshal_data);
+
+/* VOID:UINT64 (gstrtpbin-marshal.list:12) */
+extern void gst_rtp_bin_marshal_VOID__UINT64 (GClosure     *closure,
+                                              GValue       *return_value,
+                                              guint         n_param_values,
+                                              const GValue *param_values,
+                                              gpointer      invocation_hint,
+                                              gpointer      marshal_data);
+
 G_END_DECLS
 
 #endif /* __gst_rtp_bin_marshal_MARSHAL_H__ */