projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3186196
)
Bump version after releases
author
Tim-Philipp Müller
<tim.muller@collabora.co.uk>
Thu, 23 Feb 2012 10:36:57 +0000
(10:36 +0000)
committer
Tim-Philipp Müller
<tim.muller@collabora.co.uk>
Thu, 23 Feb 2012 10:36:57 +0000
(10:36 +0000)
configure.ac
patch
|
blob
|
history
docs/plugins/gstreamer-plugins.hierarchy
patch
|
blob
|
history
docs/plugins/inspect/plugin-coreelements.xml
patch
|
blob
|
history
docs/plugins/inspect/plugin-coreindexers.xml
patch
|
blob
|
history
win32/common/config.h
patch
|
blob
|
history
win32/common/gstenumtypes.c
patch
|
blob
|
history
win32/common/gstversion.h
patch
|
blob
|
history
diff --git
a/configure.ac
b/configure.ac
index
90daf07
..
4fab0c9
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
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.3
5
.1,
+AC_INIT(GStreamer, 0.10.3
6
.1,
http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
gstreamer)
AG_GST_INIT
http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
gstreamer)
AG_GST_INIT
diff --git
a/docs/plugins/gstreamer-plugins.hierarchy
b/docs/plugins/gstreamer-plugins.hierarchy
index
ea81e4a
..
141e3b0
100644
(file)
--- a/
docs/plugins/gstreamer-plugins.hierarchy
+++ b/
docs/plugins/gstreamer-plugins.hierarchy
@@
-27,6
+27,7
@@
GObject
GstTypeFindElement
GstValve
GstIndex
GstTypeFindElement
GstValve
GstIndex
+ GstFileIndex
GstMemIndex
GstPad
GstPadTemplate
GstMemIndex
GstPad
GstPadTemplate
diff --git
a/docs/plugins/inspect/plugin-coreelements.xml
b/docs/plugins/inspect/plugin-coreelements.xml
index
e99c780
..
f67a60b
100644
(file)
--- a/
docs/plugins/inspect/plugin-coreelements.xml
+++ b/
docs/plugins/inspect/plugin-coreelements.xml
@@
-3,7
+3,7
@@
<description>standard GStreamer elements</description>
<filename>../../plugins/elements/.libs/libgstcoreelements.so</filename>
<basename>libgstcoreelements.so</basename>
<description>standard GStreamer elements</description>
<filename>../../plugins/elements/.libs/libgstcoreelements.so</filename>
<basename>libgstcoreelements.so</basename>
- <version>0.10.3
5
.1</version>
+ <version>0.10.3
6
.1</version>
<license>LGPL</license>
<source>gstreamer</source>
<package>GStreamer git</package>
<license>LGPL</license>
<source>gstreamer</source>
<package>GStreamer git</package>
@@
-331,4
+331,4
@@
</pads>
</element>
</elements>
</pads>
</element>
</elements>
-</plugin>
+</plugin>
\ No newline at end of file
diff --git
a/docs/plugins/inspect/plugin-coreindexers.xml
b/docs/plugins/inspect/plugin-coreindexers.xml
index
80f072e
..
8356f0c
100644
(file)
--- a/
docs/plugins/inspect/plugin-coreindexers.xml
+++ b/
docs/plugins/inspect/plugin-coreindexers.xml
@@
-3,11
+3,11
@@
<description>GStreamer core indexers</description>
<filename>../../plugins/indexers/.libs/libgstcoreindexers.so</filename>
<basename>libgstcoreindexers.so</basename>
<description>GStreamer core indexers</description>
<filename>../../plugins/indexers/.libs/libgstcoreindexers.so</filename>
<basename>libgstcoreindexers.so</basename>
- <version>0.10.3
5
.1</version>
+ <version>0.10.3
6
.1</version>
<license>LGPL</license>
<source>gstreamer</source>
<package>GStreamer git</package>
<origin>Unknown package origin</origin>
<elements>
</elements>
<license>LGPL</license>
<source>gstreamer</source>
<package>GStreamer git</package>
<origin>Unknown package origin</origin>
<elements>
</elements>
-</plugin>
+</plugin>
\ No newline at end of file
diff --git
a/win32/common/config.h
b/win32/common/config.h
index
af2c8e5
..
dbc82e4
100644
(file)
--- a/
win32/common/config.h
+++ b/
win32/common/config.h
@@
-65,7
+65,7
@@
#define GST_PACKAGE_ORIGIN "Unknown package origin"
/* GStreamer package release date/time for plugins as YYYY-MM-DD */
#define GST_PACKAGE_ORIGIN "Unknown package origin"
/* GStreamer package release date/time for plugins as YYYY-MM-DD */
-#define GST_PACKAGE_RELEASE_DATETIME "201
1-06-18T12:45
Z"
+#define GST_PACKAGE_RELEASE_DATETIME "201
2-02-23T10:04
Z"
/* location of the installed gst-plugin-scanner */
#define GST_PLUGIN_SCANNER_INSTALLED LIBDIR "\\gst-plugin-scanner"
/* location of the installed gst-plugin-scanner */
#define GST_PLUGIN_SCANNER_INSTALLED LIBDIR "\\gst-plugin-scanner"
@@
-256,6
+256,9
@@
/* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
/* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
+/* Define to 1 if you have the <sys/poll.h> header file. */
+#undef HAVE_SYS_POLL_H
+
/* Define to 1 if you have the <sys/prctl.h> header file. */
#undef HAVE_SYS_PRCTL_H
/* Define to 1 if you have the <sys/prctl.h> header file. */
#undef HAVE_SYS_PRCTL_H
@@
-340,7
+343,7
@@
#define PACKAGE_NAME "GStreamer"
/* Define to the full name and version of this package. */
#define PACKAGE_NAME "GStreamer"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GStreamer 0.10.3
5
.1"
+#define PACKAGE_STRING "GStreamer 0.10.3
6
.1"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "gstreamer"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "gstreamer"
@@
-349,7
+352,7
@@
#undef PACKAGE_URL
/* Define to the version of this package. */
#undef PACKAGE_URL
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.10.3
5
.1"
+#define PACKAGE_VERSION "0.10.3
6
.1"
/* directory where plugins are located */
#ifdef _DEBUG
/* directory where plugins are located */
#ifdef _DEBUG
@@
-380,7
+383,7
@@
#undef USE_POISONING
/* Version number of package */
#undef USE_POISONING
/* Version number of package */
-#define VERSION "0.10.3
5
.1"
+#define VERSION "0.10.3
6
.1"
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
/* 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
7a0f5ae
..
e1edd0d
100644
(file)
--- a/
win32/common/gstenumtypes.c
+++ b/
win32/common/gstenumtypes.c
@@
-84,6
+84,7
@@
gst_buffer_copy_flags_get_type (void)
{C_FLAGS (GST_BUFFER_COPY_TIMESTAMPS), "GST_BUFFER_COPY_TIMESTAMPS",
"timestamps"},
{C_FLAGS (GST_BUFFER_COPY_CAPS), "GST_BUFFER_COPY_CAPS", "caps"},
{C_FLAGS (GST_BUFFER_COPY_TIMESTAMPS), "GST_BUFFER_COPY_TIMESTAMPS",
"timestamps"},
{C_FLAGS (GST_BUFFER_COPY_CAPS), "GST_BUFFER_COPY_CAPS", "caps"},
+ {C_FLAGS (GST_BUFFER_COPY_QDATA), "GST_BUFFER_COPY_QDATA", "qdata"},
{0, NULL, NULL}
};
{0, NULL, NULL}
};
@@
-160,6
+161,7
@@
gst_caps_flags_get_type (void)
{
static gsize id = 0;
static const GFlagsValue values[] = {
{
static gsize id = 0;
static const GFlagsValue values[] = {
+ {C_FLAGS (GST_CAPS_FLAGS_NONE), "GST_CAPS_FLAGS_NONE", "none"},
{C_FLAGS (GST_CAPS_FLAGS_ANY), "GST_CAPS_FLAGS_ANY", "any"},
{0, NULL, NULL}
};
{C_FLAGS (GST_CAPS_FLAGS_ANY), "GST_CAPS_FLAGS_ANY", "any"},
{0, NULL, NULL}
};
@@
-1475,6
+1477,7
@@
gst_alloc_trace_flags_get_type (void)
{
static gsize id = 0;
static const GFlagsValue values[] = {
{
static gsize id = 0;
static const GFlagsValue values[] = {
+ {C_FLAGS (GST_ALLOC_TRACE_NONE), "GST_ALLOC_TRACE_NONE", "none"},
{C_FLAGS (GST_ALLOC_TRACE_LIVE), "GST_ALLOC_TRACE_LIVE", "live"},
{C_FLAGS (GST_ALLOC_TRACE_MEM_LIVE), "GST_ALLOC_TRACE_MEM_LIVE",
"mem-live"},
{C_FLAGS (GST_ALLOC_TRACE_LIVE), "GST_ALLOC_TRACE_LIVE", "live"},
{C_FLAGS (GST_ALLOC_TRACE_MEM_LIVE), "GST_ALLOC_TRACE_MEM_LIVE",
"mem-live"},
@@
-1495,6
+1498,7
@@
gst_type_find_probability_get_type (void)
{
static gsize id = 0;
static const GEnumValue values[] = {
{
static gsize id = 0;
static const GEnumValue values[] = {
+ {C_ENUM (GST_TYPE_FIND_NONE), "GST_TYPE_FIND_NONE", "none"},
{C_ENUM (GST_TYPE_FIND_MINIMUM), "GST_TYPE_FIND_MINIMUM", "minimum"},
{C_ENUM (GST_TYPE_FIND_POSSIBLE), "GST_TYPE_FIND_POSSIBLE", "possible"},
{C_ENUM (GST_TYPE_FIND_LIKELY), "GST_TYPE_FIND_LIKELY", "likely"},
{C_ENUM (GST_TYPE_FIND_MINIMUM), "GST_TYPE_FIND_MINIMUM", "minimum"},
{C_ENUM (GST_TYPE_FIND_POSSIBLE), "GST_TYPE_FIND_POSSIBLE", "possible"},
{C_ENUM (GST_TYPE_FIND_LIKELY), "GST_TYPE_FIND_LIKELY", "likely"},
diff --git
a/win32/common/gstversion.h
b/win32/common/gstversion.h
index
044b181
..
f1154e2
100644
(file)
--- a/
win32/common/gstversion.h
+++ b/
win32/common/gstversion.h
@@
-57,7
+57,7
@@
G_BEGIN_DECLS
*
* The micro version of GStreamer at compile time:
*/
*
* The micro version of GStreamer at compile time:
*/
-#define GST_VERSION_MICRO (3
5
)
+#define GST_VERSION_MICRO (3
6
)
/**
* GST_VERSION_NANO:
*
/**
* GST_VERSION_NANO:
*