summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim.muller@collabora.co.uk>2010-04-14 14:13:25 +0100
committerTim-Philipp Müller <tim.muller@collabora.co.uk>2010-04-14 15:35:06 +0100
commite9431554fae889cc28b5b1f7b824596e968c738d (patch)
tree06a54108fe286858b4a58b1180da5c1a9b678313
parent99cd85fe18e3708b69722bd2263c14d850740687 (diff)
0.10.28.2 pre-release
-rw-r--r--configure.ac4
-rw-r--r--gst-libs/gst/tag/lang-tables.dat2
-rw-r--r--win32/common/_stdint.h4
-rw-r--r--win32/common/config.h8
-rw-r--r--win32/common/video-enumtypes.c3
5 files changed, 12 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac
index 6f9a47a05..916ebcc17 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.28.1,
+AC_INIT(GStreamer Base Plug-ins, 0.10.28.2,
http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
gst-plugins-base)
@@ -49,7 +49,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, 19, 2, 19)
+AS_LIBTOOL(GST, 20, 0, 20)
dnl FIXME: this macro doesn't actually work;
dnl the generated libtool script has no support for the listed tags.
diff --git a/gst-libs/gst/tag/lang-tables.dat b/gst-libs/gst/tag/lang-tables.dat
index 5e40aafdc..3367f7038 100644
--- a/gst-libs/gst/tag/lang-tables.dat
+++ b/gst-libs/gst/tag/lang-tables.dat
@@ -1,4 +1,4 @@
-/* generated by mklangtables.c iso-codes 3.12 */
+/* generated by mklangtables.c iso-codes 3.15 */
#include <glib.h>
diff --git a/win32/common/_stdint.h b/win32/common/_stdint.h
index 0e1e64d9a..19b359bfe 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.28.1"
-/* generated using gnu compiler gcc (Debian 4.4.3-3) 4.4.3 */
+#define _GENERATED_STDINT_H "gst-plugins-base 0.10.28.2"
+/* generated using gnu compiler gcc (Debian 4.4.3-7) 4.4.3 */
#define _STDINT_HAVE_STDINT_H 1
#include <stdint.h>
#endif
diff --git a/win32/common/config.h b/win32/common/config.h
index c685aea08..0aa375932 100644
--- a/win32/common/config.h
+++ b/win32/common/config.h
@@ -66,7 +66,7 @@
#define GST_LICENSE "LGPL"
/* 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"
@@ -322,7 +322,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.28.1"
+#define PACKAGE_STRING "GStreamer Base Plug-ins 0.10.28.2"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "gst-plugins-base"
@@ -331,7 +331,7 @@
#undef PACKAGE_URL
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.10.28.1"
+#define PACKAGE_VERSION "0.10.28.2"
/* directory where plugins are located */
#ifdef _DEBUG
@@ -359,7 +359,7 @@
#undef STDC_HEADERS
/* Version number of package */
-#define VERSION "0.10.28.1"
+#define VERSION "0.10.28.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 c5b9e46e7..2072504a8 100644
--- a/win32/common/video-enumtypes.c
+++ b/win32/common/video-enumtypes.c
@@ -36,6 +36,9 @@ gst_video_format_get_type (void)
{GST_VIDEO_FORMAT_v216, "GST_VIDEO_FORMAT_v216", "v216"},
{GST_VIDEO_FORMAT_NV12, "GST_VIDEO_FORMAT_NV12", "nv12"},
{GST_VIDEO_FORMAT_NV21, "GST_VIDEO_FORMAT_NV21", "nv21"},
+ {GST_VIDEO_FORMAT_GRAY8, "GST_VIDEO_FORMAT_GRAY8", "gray8"},
+ {GST_VIDEO_FORMAT_GRAY16_BE, "GST_VIDEO_FORMAT_GRAY16_BE", "gray16-be"},
+ {GST_VIDEO_FORMAT_GRAY16_LE, "GST_VIDEO_FORMAT_GRAY16_LE", "gray16-le"},
{0, NULL, NULL}
};
GType g_define_type_id = g_enum_register_static ("GstVideoFormat", values);