0.10.32.2 pre-release

diff --git a/configure.ac b/configure.ac
index a918ebb42c18f16696b8709e035dfd96dc4dceae..7f8c3db6160601577bbd4fb347fb047d8137dc92 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ(2.60)
 dnl initialize autoconf
 dnl when going to/from release please set the nano (fourth number) right !
 dnl releases only do Wall, git and prerelease does Werror too
-AC_INIT(GStreamer, 0.10.32.1,
+AC_INIT(GStreamer, 0.10.32.2,
     http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
     gstreamer)
 AG_GST_INIT

diff --git a/docs/plugins/gstreamer-plugins.args b/docs/plugins/gstreamer-plugins.args
index 507789f70a1b37a51024f06c126f5bd4769509e5..75548b2bcdb9c824ea0da5671c313ed5739b8a3c 100644 (file)
--- a/docs/plugins/gstreamer-plugins.args
+++ b/docs/plugins/gstreamer-plugins.args
@@ -994,7 +994,7 @@
 <RANGE></RANGE>
 <FLAGS>rw</FLAGS>
 <NICK>Max. ring buffer size (bytes)</NICK>
-<BLURB>Max. amount of data in the ring buffer (bytes, 0 = disabled.</BLURB>
+<BLURB>Max. amount of data in the ring buffer (bytes, 0 = disabled).</BLURB>
 <DEFAULT>0</DEFAULT>
 </ARG>
 

diff --git a/docs/plugins/inspect/plugin-coreelements.xml b/docs/plugins/inspect/plugin-coreelements.xml
index d0acd6440ba27f72aeb560e1af192907c016640c..41c43f502e4994f2103ccfcc447d78fe78b6ddeb 100644 (file)
--- a/docs/plugins/inspect/plugin-coreelements.xml
+++ b/docs/plugins/inspect/plugin-coreelements.xml
@@ -3,10 +3,10 @@
   <description>standard GStreamer elements</description>
   <filename>../../plugins/elements/.libs/libgstcoreelements.so</filename>
   <basename>libgstcoreelements.so</basename>
-  <version>0.10.32.1</version>
+  <version>0.10.32.2</version>
   <license>LGPL</license>
   <source>gstreamer</source>
-  <package>GStreamer git</package>
+  <package>GStreamer prerelease</package>
   <origin>Unknown package origin</origin>
   <elements>
     <element>
@@ -122,7 +122,7 @@
     </element>
     <element>
       <name>funnel</name>
-      <longname>Farsight Funnel pipe fitting</longname>
+      <longname>Funnel pipe fitting</longname>
       <class>Generic</class>
       <description>N-to-1 pipe fitting</description>
       <author>Olivier Crete &lt;olivier.crete@collabora.co.uk&gt;</author>

diff --git a/docs/plugins/inspect/plugin-coreindexers.xml b/docs/plugins/inspect/plugin-coreindexers.xml
index 29f92f5d5398ac9d8ea9b0ab5a34f2093521423d..31b1908af57de0b9652d65ffa7fdf1065e0c69e4 100644 (file)
--- a/docs/plugins/inspect/plugin-coreindexers.xml
+++ b/docs/plugins/inspect/plugin-coreindexers.xml
@@ -3,10 +3,10 @@
   <description>GStreamer core indexers</description>
   <filename>../../plugins/indexers/.libs/libgstcoreindexers.so</filename>
   <basename>libgstcoreindexers.so</basename>
-  <version>0.10.32.1</version>
+  <version>0.10.32.2</version>
   <license>LGPL</license>
   <source>gstreamer</source>
-  <package>GStreamer git</package>
+  <package>GStreamer prerelease</package>
   <origin>Unknown package origin</origin>
   <elements>
   </elements>

diff --git a/win32/common/config.h b/win32/common/config.h
index a58663cc10348670df475d8a5383f23f5815139c..756fc529ea62bc1d8b368bc3268c69326f0b4ff6 100644 (file)
--- a/win32/common/config.h
+++ b/win32/common/config.h
@@ -59,13 +59,13 @@
 #define GST_MAJORMINOR "0.10"
 
 /* package name in plugins */
-#define GST_PACKAGE_NAME "GStreamer git"
+#define GST_PACKAGE_NAME "GStreamer prerelease"
 
 /* package origin */
 #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-23T23:22Z"
+#define GST_PACKAGE_RELEASE_DATETIME "2011-04-16T12:48Z"
 
 /* location of the installed gst-plugin-scanner */
 #define GST_PLUGIN_SCANNER_INSTALLED LIBDIR "\\gst-plugin-scanner"
@@ -340,7 +340,7 @@
 #define PACKAGE_NAME "GStreamer"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GStreamer 0.10.32.1"
+#define PACKAGE_STRING "GStreamer 0.10.32.2"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "gstreamer"
@@ -349,7 +349,7 @@
 #undef PACKAGE_URL
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.10.32.1"
+#define PACKAGE_VERSION "0.10.32.2"
 
 /* directory where plugins are located */
 #ifdef _DEBUG
@@ -380,7 +380,7 @@
 #undef USE_POISONING
 
 /* Version number of package */
-#define VERSION "0.10.32.1"
+#define VERSION "0.10.32.2"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */

diff --git a/win32/common/gstenumtypes.c b/win32/common/gstenumtypes.c
index a21b61e4e8f421425649b834285e952530adecd1..7a0f5ae30d3d9fcb4b489b59a6b84c22aba032c8 100644 (file)
--- a/win32/common/gstenumtypes.c
+++ b/win32/common/gstenumtypes.c
@@ -53,6 +53,7 @@ gst_buffer_flag_get_type (void)
   static const GFlagsValue values[] = {
     {C_FLAGS (GST_BUFFER_FLAG_READONLY), "GST_BUFFER_FLAG_READONLY",
         "readonly"},
+    {C_FLAGS (GST_BUFFER_FLAG_MEDIA4), "GST_BUFFER_FLAG_MEDIA4", "media4"},
     {C_FLAGS (GST_BUFFER_FLAG_PREROLL), "GST_BUFFER_FLAG_PREROLL", "preroll"},
     {C_FLAGS (GST_BUFFER_FLAG_DISCONT), "GST_BUFFER_FLAG_DISCONT", "discont"},
     {C_FLAGS (GST_BUFFER_FLAG_IN_CAPS), "GST_BUFFER_FLAG_IN_CAPS", "in-caps"},
@@ -171,6 +172,25 @@ gst_caps_flags_get_type (void)
   return (GType) id;
 }
 
+GType
+gst_caps_intersect_mode_get_type (void)
+{
+  static gsize id = 0;
+  static const GEnumValue values[] = {
+    {C_ENUM (GST_CAPS_INTERSECT_ZIG_ZAG), "GST_CAPS_INTERSECT_ZIG_ZAG",
+        "zig-zag"},
+    {C_ENUM (GST_CAPS_INTERSECT_FIRST), "GST_CAPS_INTERSECT_FIRST", "first"},
+    {0, NULL, NULL}
+  };
+
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstCapsIntersectMode", values);
+    g_once_init_leave (&id, tmp);
+  }
+
+  return (GType) id;
+}
+
 /* enumerations from "gstclock.h" */
 GType
 gst_clock_return_get_type (void)
@@ -605,6 +625,25 @@ gst_seek_flags_get_type (void)
   return (GType) id;
 }
 
+GType
+gst_qos_type_get_type (void)
+{
+  static gsize id = 0;
+  static const GEnumValue values[] = {
+    {C_ENUM (GST_QOS_TYPE_OVERFLOW), "GST_QOS_TYPE_OVERFLOW", "overflow"},
+    {C_ENUM (GST_QOS_TYPE_UNDERFLOW), "GST_QOS_TYPE_UNDERFLOW", "underflow"},
+    {C_ENUM (GST_QOS_TYPE_THROTTLE), "GST_QOS_TYPE_THROTTLE", "throttle"},
+    {0, NULL, NULL}
+  };
+
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstQOSType", values);
+    g_once_init_leave (&id, tmp);
+  }
+
+  return (GType) id;
+}
+
 /* enumerations from "gstformat.h" */
 GType
 gst_format_get_type (void)
@@ -891,6 +930,7 @@ gst_message_type_get_type (void)
         "request-state"},
     {C_FLAGS (GST_MESSAGE_STEP_START), "GST_MESSAGE_STEP_START", "step-start"},
     {C_FLAGS (GST_MESSAGE_QOS), "GST_MESSAGE_QOS", "qos"},
+    {C_FLAGS (GST_MESSAGE_PROGRESS), "GST_MESSAGE_PROGRESS", "progress"},
     {C_FLAGS (GST_MESSAGE_ANY), "GST_MESSAGE_ANY", "any"},
     {0, NULL, NULL}
   };
@@ -953,6 +993,30 @@ gst_stream_status_type_get_type (void)
   return (GType) id;
 }
 
+GType
+gst_progress_type_get_type (void)
+{
+  static gsize id = 0;
+  static const GEnumValue values[] = {
+    {C_ENUM (GST_PROGRESS_TYPE_START), "GST_PROGRESS_TYPE_START", "start"},
+    {C_ENUM (GST_PROGRESS_TYPE_CONTINUE), "GST_PROGRESS_TYPE_CONTINUE",
+        "continue"},
+    {C_ENUM (GST_PROGRESS_TYPE_COMPLETE), "GST_PROGRESS_TYPE_COMPLETE",
+        "complete"},
+    {C_ENUM (GST_PROGRESS_TYPE_CANCELED), "GST_PROGRESS_TYPE_CANCELED",
+        "canceled"},
+    {C_ENUM (GST_PROGRESS_TYPE_ERROR), "GST_PROGRESS_TYPE_ERROR", "error"},
+    {0, NULL, NULL}
+  };
+
+  if (g_once_init_enter (&id)) {
+    GType tmp = g_enum_register_static ("GstProgressType", values);
+    g_once_init_leave (&id, tmp);
+  }
+
+  return (GType) id;
+}
+
 /* enumerations from "gstminiobject.h" */
 GType
 gst_mini_object_flags_get_type (void)
@@ -961,6 +1025,8 @@ gst_mini_object_flags_get_type (void)
   static const GFlagsValue values[] = {
     {C_FLAGS (GST_MINI_OBJECT_FLAG_READONLY), "GST_MINI_OBJECT_FLAG_READONLY",
         "readonly"},
+    {C_FLAGS (GST_MINI_OBJECT_FLAG_RESERVED1), "GST_MINI_OBJECT_FLAG_RESERVED1",
+        "reserved1"},
     {C_FLAGS (GST_MINI_OBJECT_FLAG_LAST), "GST_MINI_OBJECT_FLAG_LAST", "last"},
     {0, NULL, NULL}
   };

diff --git a/win32/common/gstenumtypes.h b/win32/common/gstenumtypes.h
index 2e197275566263fed6368988d55be5f7db1134f0..292eb54847687193fd2c72f84d56ceffcba97572 100644 (file)
--- a/win32/common/gstenumtypes.h
+++ b/win32/common/gstenumtypes.h
@@ -35,6 +35,8 @@ GType gst_bus_sync_reply_get_type (void);
 /* enumerations from "gstcaps.h" */
 GType gst_caps_flags_get_type (void);
 #define GST_TYPE_CAPS_FLAGS (gst_caps_flags_get_type())
+GType gst_caps_intersect_mode_get_type (void);
+#define GST_TYPE_CAPS_INTERSECT_MODE (gst_caps_intersect_mode_get_type())
 
 /* enumerations from "gstclock.h" */
 GType gst_clock_return_get_type (void);
@@ -77,6 +79,8 @@ GType gst_seek_type_get_type (void);
 #define GST_TYPE_SEEK_TYPE (gst_seek_type_get_type())
 GType gst_seek_flags_get_type (void);
 #define GST_TYPE_SEEK_FLAGS (gst_seek_flags_get_type())
+GType gst_qos_type_get_type (void);
+#define GST_TYPE_QOS_TYPE (gst_qos_type_get_type())
 
 /* enumerations from "gstformat.h" */
 GType gst_format_get_type (void);
@@ -115,6 +119,8 @@ GType gst_structure_change_type_get_type (void);
 #define GST_TYPE_STRUCTURE_CHANGE_TYPE (gst_structure_change_type_get_type())
 GType gst_stream_status_type_get_type (void);
 #define GST_TYPE_STREAM_STATUS_TYPE (gst_stream_status_type_get_type())
+GType gst_progress_type_get_type (void);
+#define GST_TYPE_PROGRESS_TYPE (gst_progress_type_get_type())
 
 /* enumerations from "gstminiobject.h" */
 GType gst_mini_object_flags_get_type (void);

diff --git a/win32/common/gstversion.h b/win32/common/gstversion.h
index 86116c35bfd5c66014c7ceefe35a182f9bd4ad77..558dceb2f67e95cb2c51057a005f2653bcfb545b 100644 (file)
--- a/win32/common/gstversion.h
+++ b/win32/common/gstversion.h
@@ -64,7 +64,7 @@ G_BEGIN_DECLS
  * The nano version of GStreamer at compile time:
  * Actual releases have 0, GIT versions have 1, prerelease versions have 2-...
  */
-#define GST_VERSION_NANO (1)
+#define GST_VERSION_NANO (2)
 
 /**
  * GST_CHECK_VERSION: