summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim.muller@collabora.co.uk>2011-01-07 12:50:07 +0000
committerTim-Philipp Müller <tim.muller@collabora.co.uk>2011-01-07 12:50:07 +0000
commit8537f4326cd6c7e638b28b4920187fb54dbfa272 (patch)
treed75349b64bf822135ba6308c318f7ef534cebc85
parent251400a69b6f5e2dc39a4cc9d86c472a872d82c3 (diff)
0.10.31.2 pre-release
-rw-r--r--configure.ac6
-rw-r--r--win32/common/_stdint.h4
-rw-r--r--win32/common/config.h16
-rw-r--r--win32/common/pbutils-enumtypes.c2
-rw-r--r--win32/common/video-enumtypes.c5
5 files changed, 23 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac
index 287cc476f..6478a6cb7 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.31.1,
+AC_INIT(GStreamer Base Plug-ins, 0.10.31.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, 22, 0, 22)
+AS_LIBTOOL(GST, 23, 0, 23)
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.31.1
+GST_REQ=0.10.31.2
dnl *** autotools stuff ****
diff --git a/win32/common/_stdint.h b/win32/common/_stdint.h
index c731bb5cf..c8fd32c59 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.31.1"
-/* generated using gnu compiler gcc (Debian 4.4.5-8) 4.4.5 */
+#define _GENERATED_STDINT_H "gst-plugins-base 0.10.31.2"
+/* generated using gnu compiler gcc (Debian 4.4.5-10) 4.4.5 */
#define _STDINT_HAVE_STDINT_H 1
#include <stdint.h>
#endif
diff --git a/win32/common/config.h b/win32/common/config.h
index 463159c01..407021995 100644
--- a/win32/common/config.h
+++ b/win32/common/config.h
@@ -53,6 +53,9 @@
/* The GnomeVFS modules directory. */
#undef GNOME_VFS_MODULES_DIR
+/* system wide data directory */
+#define GST_DATADIR PREFIX "\\share"
+
/* macro to use to show function name */
#undef GST_FUNCTION
@@ -68,14 +71,17 @@
/* GStreamer license */
#define GST_LICENSE "LGPL"
+/* major/minor version */
+#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 "2010-12-02T00:05Z"
+#define GST_PACKAGE_RELEASE_DATETIME "2011-01-06T23:48Z"
/* I know the API is subject to change. */
#undef G_UDEV_API_IS_SUBJECT_TO_CHANGE
@@ -331,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.31.1"
+#define PACKAGE_STRING "GStreamer Base Plug-ins 0.10.31.2"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "gst-plugins-base"
@@ -340,7 +346,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
@@ -368,7 +374,7 @@
#undef STDC_HEADERS
/* 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/pbutils-enumtypes.c b/win32/common/pbutils-enumtypes.c
index 8303b77bb..2652ec066 100644
--- a/win32/common/pbutils-enumtypes.c
+++ b/win32/common/pbutils-enumtypes.c
@@ -6,6 +6,8 @@
#include "pbutils.h"
#include "codec-utils.h"
#include "descriptions.h"
+#include "encoding-profile.h"
+#include "encoding-target.h"
#include "install-plugins.h"
#include "missing-plugins.h"
#include "gstdiscoverer.h"
diff --git a/win32/common/video-enumtypes.c b/win32/common/video-enumtypes.c
index 66477c22b..f1ba0e577 100644
--- a/win32/common/video-enumtypes.c
+++ b/win32/common/video-enumtypes.c
@@ -48,6 +48,11 @@ gst_video_format_get_type (void)
{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"},
+ {GST_VIDEO_FORMAT_RGB8_PALETTED, "GST_VIDEO_FORMAT_RGB8_PALETTED",
+ "rgb8-paletted"},
+ {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"},
{0, NULL, NULL}
};
GType g_define_type_id = g_enum_register_static ("GstVideoFormat", values);