diff --git a/configure.ac b/configure.ac
index 6cb7ee42e5..b130f76079 100644
--- 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.31.1,
+AC_INIT(GStreamer, 0.10.31.2,
http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
gstreamer)
AG_GST_INIT
@@ -48,7 +48,7 @@ dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0
dnl - interfaces added -> increment AGE
dnl - interfaces removed -> AGE = 0
dnl sets GST_LT_LDFLAGS
-AS_LIBTOOL(GST, 27, 0, 27)
+AS_LIBTOOL(GST, 28, 0, 28)
dnl FIXME: this macro doesn't actually work;
dnl the generated libtool script has no support for the listed tags.
diff --git a/docs/plugins/gstreamer-plugins.args b/docs/plugins/gstreamer-plugins.args
index d4d18e716b..9fa076ba26 100644
--- a/docs/plugins/gstreamer-plugins.args
+++ b/docs/plugins/gstreamer-plugins.args
@@ -1028,6 +1028,16 @@
FALSE
+
+GstOutputSelector::pad-negotiation-mode
+GstOutputSelectorPadNegotiationMode
+
+rw
+Pad negotiation mode
+The mode to be used for pad negotiation.
+All
+
+
GstInputSelector::active-pad
GstPad*
diff --git a/docs/plugins/inspect/plugin-coreelements.xml b/docs/plugins/inspect/plugin-coreelements.xml
index e15c2083e6..4d8e246d6d 100644
--- a/docs/plugins/inspect/plugin-coreelements.xml
+++ b/docs/plugins/inspect/plugin-coreelements.xml
@@ -3,10 +3,10 @@
standard GStreamer elements
../../plugins/elements/.libs/libgstcoreelements.so
libgstcoreelements.so
- 0.10.31.1
+ 0.10.31.2
LGPL
- GStreamer git
+ GStreamer prerelease
Unknown package origin
@@ -145,7 +145,7 @@
input-selector
Input selector
Generic
- N-to-1 input stream selectoring
+ N-to-1 input stream selector
Julien Moutte <julien@moutte.net>, Jan Schmidt <thaytan@mad.scientist.com>, Wim Taymans <wim.taymans@gmail.com>
diff --git a/docs/plugins/inspect/plugin-coreindexers.xml b/docs/plugins/inspect/plugin-coreindexers.xml
index 4028dfa9a2..82b6ce1eac 100644
--- a/docs/plugins/inspect/plugin-coreindexers.xml
+++ b/docs/plugins/inspect/plugin-coreindexers.xml
@@ -3,10 +3,10 @@
GStreamer core indexers
../../plugins/indexers/.libs/libgstcoreindexers.so
libgstcoreindexers.so
- 0.10.31.1
+ 0.10.31.2
LGPL
- GStreamer git
+ GStreamer prerelease
Unknown package origin
diff --git a/win32/common/config.h b/win32/common/config.h
index fa5470b59b..0da93bf713 100644
--- 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 "2010-12-01T23:43Z"
+#define GST_PACKAGE_RELEASE_DATETIME "2011-01-06T18:14Z"
/* 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.31.1"
+#define PACKAGE_STRING "GStreamer 0.10.31.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.31.1"
+#define PACKAGE_VERSION "0.10.31.2"
/* directory where plugins are located */
#ifdef _DEBUG
@@ -380,7 +380,7 @@
#undef USE_POISONING
/* Version number of package */
-#define VERSION "0.10.31.1"
+#define VERSION "0.10.31.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 e7baae9a0c..a21b61e4e8 100644
--- a/win32/common/gstenumtypes.c
+++ b/win32/common/gstenumtypes.c
@@ -184,6 +184,7 @@ gst_clock_return_get_type (void)
{C_ENUM (GST_CLOCK_BADTIME), "GST_CLOCK_BADTIME", "badtime"},
{C_ENUM (GST_CLOCK_ERROR), "GST_CLOCK_ERROR", "error"},
{C_ENUM (GST_CLOCK_UNSUPPORTED), "GST_CLOCK_UNSUPPORTED", "unsupported"},
+ {C_ENUM (GST_CLOCK_DONE), "GST_CLOCK_DONE", "done"},
{0, NULL, NULL}
};
diff --git a/win32/common/gstversion.h b/win32/common/gstversion.h
index ec87af6ea5..c62d717f51 100644
--- 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:
@@ -81,7 +81,9 @@ G_BEGIN_DECLS
(GST_VERSION_MAJOR > (major) || \
(GST_VERSION_MAJOR == (major) && GST_VERSION_MINOR > (minor)) || \
(GST_VERSION_MAJOR == (major) && GST_VERSION_MINOR == (minor) && \
- GST_VERSION_MICRO >= (micro)))
+ GST_VERSION_MICRO >= (micro)) || \
+ (GST_VERSION_MAJOR == (major) && GST_VERSION_MINOR == (minor) && \
+ GST_VERSION_MICRO + 1 == (micro) && GST_VERSION_NANO > 0))
G_END_DECLS