From e8c3f1e4369737bb5fd3b74491b37f63a5c73803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 16 Oct 2010 01:08:38 +0100 Subject: [PATCH] 0.10.30.2 pre-release --- configure.ac | 6 +++--- win32/common/_stdint.h | 4 ++-- win32/common/config.h | 10 +++++----- win32/common/pbutils-enumtypes.c | 1 + win32/common/pbutils-enumtypes.h | 6 +++--- win32/common/video-enumtypes.c | 1 + 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 8a8bb27cbc..e29dc56339 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.30.1, +AC_INIT(GStreamer Base Plug-ins, 0.10.30.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, 21, 0, 21) +AS_LIBTOOL(GST, 22, 0, 22) dnl FIXME: this macro doesn't actually work; dnl the generated libtool script has no support for the listed tags. @@ -60,7 +60,7 @@ AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL dnl *** required versions of GStreamer stuff *** -GST_REQ=0.10.30.1 +GST_REQ=0.10.30.2 dnl *** autotools stuff **** diff --git a/win32/common/_stdint.h b/win32/common/_stdint.h index 4e6ac08083..2069754758 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.30.1" -/* generated using gnu compiler gcc (Debian 4.4.4-15) 4.4.5 20100913 (prerelease) */ +#define _GENERATED_STDINT_H "gst-plugins-base 0.10.30.2" +/* generated using gnu compiler gcc (Debian 4.4.5-3) 4.4.5 */ #define _STDINT_HAVE_STDINT_H 1 #include #endif diff --git a/win32/common/config.h b/win32/common/config.h index 2d9bd68cdb..d4bb942f7a 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -69,13 +69,13 @@ #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" /* GStreamer package release date/time for plugins as YYYY-MM-DD */ -#define GST_PACKAGE_RELEASE_DATETIME "2010-09-24T11:21Z" +#define GST_PACKAGE_RELEASE_DATETIME "2010-10-16T00:00Z" /* I know the API is subject to change. */ #undef G_UDEV_API_IS_SUBJECT_TO_CHANGE @@ -331,7 +331,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.30.1" +#define PACKAGE_STRING "GStreamer Base Plug-ins 0.10.30.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gst-plugins-base" @@ -340,7 +340,7 @@ #undef PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.10.30.1" +#define PACKAGE_VERSION "0.10.30.2" /* directory where plugins are located */ #ifdef _DEBUG @@ -368,7 +368,7 @@ #undef STDC_HEADERS /* Version number of package */ -#define VERSION "0.10.30.1" +#define VERSION "0.10.30.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/pbutils-enumtypes.c b/win32/common/pbutils-enumtypes.c index 375b84462f..8303b77bb8 100644 --- a/win32/common/pbutils-enumtypes.c +++ b/win32/common/pbutils-enumtypes.c @@ -4,6 +4,7 @@ #include "pbutils-enumtypes.h" #include "pbutils.h" +#include "codec-utils.h" #include "descriptions.h" #include "install-plugins.h" #include "missing-plugins.h" diff --git a/win32/common/pbutils-enumtypes.h b/win32/common/pbutils-enumtypes.h index 2a59c684c1..30dadfd955 100644 --- a/win32/common/pbutils-enumtypes.h +++ b/win32/common/pbutils-enumtypes.h @@ -1,8 +1,8 @@ -#ifndef __GST_INSTALL_ENUM_TYPES_H__ -#define __GST_INSTALL_ENUM_TYPES_H__ +#ifndef __PB_UTILS_ENUM_TYPES_H__ +#define __PB_UTILS_ENUM_TYPES_H__ #include @@ -17,7 +17,7 @@ GType gst_discoverer_result_get_type (void); #define GST_TYPE_DISCOVERER_RESULT (gst_discoverer_result_get_type()) G_END_DECLS -#endif /* __GST_INSTALL_ENUM_TYPES_H__ */ +#endif /* __PB_UTILS_ENUM_TYPES_H__ */ diff --git a/win32/common/video-enumtypes.c b/win32/common/video-enumtypes.c index 6c31aebe52..66477c22bc 100644 --- a/win32/common/video-enumtypes.c +++ b/win32/common/video-enumtypes.c @@ -47,6 +47,7 @@ gst_video_format_get_type (void) {GST_VIDEO_FORMAT_RGB15, "GST_VIDEO_FORMAT_RGB15", "rgb15"}, {GST_VIDEO_FORMAT_BGR15, "GST_VIDEO_FORMAT_BGR15", "bgr15"}, {GST_VIDEO_FORMAT_UYVP, "GST_VIDEO_FORMAT_UYVP", "uyvp"}, + {GST_VIDEO_FORMAT_A420, "GST_VIDEO_FORMAT_A420", "a420"}, {0, NULL, NULL} }; GType g_define_type_id = g_enum_register_static ("GstVideoFormat", values);