summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim.muller@collabora.co.uk>2011-04-16 16:03:56 +0100
committerTim-Philipp Müller <tim.muller@collabora.co.uk>2011-04-16 16:03:56 +0100
commite120c835c1bd7b5797b5f77201e5231f9f71f007 (patch)
tree16c0860c9a701bf8b6d2c4ed2ed25a2a7d7c0f4c
parent82a791519c364c98670858697f7490306cf38707 (diff)
0.10.32.2 pre-release
-rw-r--r--configure.ac2
-rw-r--r--win32/common/_stdint.h4
-rw-r--r--win32/common/config.h13
-rw-r--r--win32/common/video-enumtypes.c3
4 files changed, 14 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index 7b6a8ce24..0736be68a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl please read gstreamer/docs/random/autotools before changing this file
dnl initialize autoconf
dnl releases only do -Wall, git and prerelease does -Werror too
dnl use a three digit version number for releases, and four for git/prerelease
-AC_INIT(GStreamer Base Plug-ins, 0.10.32.1,
+AC_INIT(GStreamer Base Plug-ins, 0.10.32.2,
http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
gst-plugins-base)
diff --git a/win32/common/_stdint.h b/win32/common/_stdint.h
index 86481efef..e707a045b 100644
--- a/win32/common/_stdint.h
+++ b/win32/common/_stdint.h
@@ -1,8 +1,8 @@
#ifndef _GST_PLUGINS_BASE__STDINT_H
#define _GST_PLUGINS_BASE__STDINT_H 1
#ifndef _GENERATED_STDINT_H
-#define _GENERATED_STDINT_H "gst-plugins-base 0.10.32.1"
-/* generated using gnu compiler gcc (Debian 4.4.5-10) 4.4.5 */
+#define _GENERATED_STDINT_H "gst-plugins-base 0.10.32.2"
+/* generated using gnu compiler gcc-4.6 (Debian 4.6.0-2) 4.6.1 20110329 (prerelease) */
#define _STDINT_HAVE_STDINT_H 1
#include <stdint.h>
#endif
diff --git a/win32/common/config.h b/win32/common/config.h
index 1b5ecec9e..a7aaf6e56 100644
--- a/win32/common/config.h
+++ b/win32/common/config.h
@@ -75,13 +75,13 @@
#define GST_MAJORMINOR "0.10"
/* package name in plugins */
-#define GST_PACKAGE_NAME "GStreamer Base Plug-ins git"
+#define GST_PACKAGE_NAME "GStreamer Base Plug-ins 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-27T15:23Z"
+#define GST_PACKAGE_RELEASE_DATETIME "2011-04-16T14:36Z"
/* I know the API is subject to change. */
#undef G_UDEV_API_IS_SUBJECT_TO_CHANGE
@@ -337,7 +337,7 @@
#define PACKAGE_NAME "GStreamer Base Plug-ins"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GStreamer Base Plug-ins 0.10.32.1"
+#define PACKAGE_STRING "GStreamer Base Plug-ins 0.10.32.2"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "gst-plugins-base"
@@ -346,7 +346,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
@@ -373,8 +373,11 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
+/* "Define if building for android" */
+#undef USE_TREMOLO
+
/* 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/video-enumtypes.c b/win32/common/video-enumtypes.c
index f1ba0e577..caa2aef0a 100644
--- a/win32/common/video-enumtypes.c
+++ b/win32/common/video-enumtypes.c
@@ -53,6 +53,9 @@ gst_video_format_get_type (void)
{GST_VIDEO_FORMAT_YUV9, "GST_VIDEO_FORMAT_YUV9", "yuv9"},
{GST_VIDEO_FORMAT_YVU9, "GST_VIDEO_FORMAT_YVU9", "yvu9"},
{GST_VIDEO_FORMAT_IYU1, "GST_VIDEO_FORMAT_IYU1", "iyu1"},
+ {GST_VIDEO_FORMAT_ARGB64, "GST_VIDEO_FORMAT_ARGB64", "argb64"},
+ {GST_VIDEO_FORMAT_AYUV64, "GST_VIDEO_FORMAT_AYUV64", "ayuv64"},
+ {GST_VIDEO_FORMAT_r210, "GST_VIDEO_FORMAT_r210", "r210"},
{0, NULL, NULL}
};
GType g_define_type_id = g_enum_register_static ("GstVideoFormat", values);