Merge branch 'master' into 0.11

[platform/upstream/gst-plugins-base.git] / win32 / common / config.h

diff --git a/win32/common/config.h b/win32/common/config.h
index 421b571..f383317 100644 (file)
--- a/win32/common/config.h
+++ b/win32/common/config.h
@@ -42,7 +42,7 @@
 #undef ENABLE_NLS
 
 /* gettext package name */
-#define GETTEXT_PACKAGE "gst-plugins-base-0.10"
+#define GETTEXT_PACKAGE "gst-plugins-base-0.11"
 
 /* The GIO library directory. */
 #undef GIO_LIBDIR
@@ -50,9 +50,6 @@
 /* The GIO modules directory. */
 #undef GIO_MODULE_DIR
 
-/* The GnomeVFS modules directory. */
-#undef GNOME_VFS_MODULES_DIR
-
 /* system wide data directory */
 #define GST_DATADIR PREFIX "\\share"
 
@@ -78,7 +75,7 @@
 #define GST_LICENSE "LGPL"
 
 /* major/minor version */
-#define GST_MAJORMINOR "0.10"
+#define GST_MAJORMINOR "0.11"
 
 /* package name in plugins */
 #define GST_PACKAGE_NAME "GStreamer Base Plug-ins git"
@@ -87,10 +84,7 @@
 #define GST_PACKAGE_ORIGIN "Unknown package origin"
 
 /* GStreamer package release date/time for plugins as YYYY-MM-DD */
-#define GST_PACKAGE_RELEASE_DATETIME "2012-02-23T10:41Z"
-
-/* I know the API is subject to change. */
-#undef G_UDEV_API_IS_SUBJECT_TO_CHANGE
+#define GST_PACKAGE_RELEASE_DATETIME "2012-02-17T22:57Z"
 
 /* Define to enable ALSA (used by alsa). */
 #undef HAVE_ALSA
@@ -164,12 +158,6 @@
 /* Define to enable building of plug-ins with external deps. */
 #undef HAVE_EXTERNAL
 
-/* FIONREAD ioctl found in sys/filio.h */
-#undef HAVE_FIONREAD_IN_SYS_FILIO
-
-/* FIONREAD ioctl found in sys/ioclt.h */
-#undef HAVE_FIONREAD_IN_SYS_IOCTL
-
 /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
 #undef HAVE_FSEEKO
 
@@ -182,21 +170,9 @@
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT
 
-/* Define to enable GIO library (used by gio). */
-#undef HAVE_GIO
-
 /* Define to 1 if you have the `gmtime_r' function. */
 #undef HAVE_GMTIME_R
 
-/* Define to enable GNOME VFS (used by gnomevfs). */
-#undef HAVE_GNOME_VFS
-
-/* Define to enable Video 4 Linux (used by video4linux). */
-#undef HAVE_GST_V4L
-
-/* Whether gudev is available for device detection */
-#undef HAVE_GUDEV
-
 /* Define if you have the iconv() function and it works. */
 #undef HAVE_ICONV
 
@@ -212,15 +188,6 @@
 /* Define to 1 if you have the `asound' library (-lasound). */
 #undef HAVE_LIBASOUND
 
-/* Define to 1 if you have the `nsl' library (-lnsl). */
-#undef HAVE_LIBNSL
-
-/* Define to 1 if you have the `resolv' library (-lresolv). */
-#undef HAVE_LIBRESOLV
-
-/* Define to 1 if you have the `socket' library (-lsocket). */
-#undef HAVE_LIBSOCKET
-
 /* Define to enable libvisual visualization library (used by libvisual). */
 #undef HAVE_LIBVISUAL
 
@@ -236,9 +203,6 @@
 /* Define if you have C99's lrintf function. */
 #undef HAVE_LRINTF
 
-/* Define to 1 if you have the <malloc.h> header file. */
-#undef HAVE_MALLOC_H
-
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
@@ -305,9 +269,6 @@
 /* Defined if compiling for Windows */
 #define HAVE_WIN32 1
 
-/* Define to 1 if you have the <winsock2.h> header file. */
-#define HAVE_WINSOCK2_H 1
-
 /* Define to enable X libraries and plugins (used by ximagesink). */
 #undef HAVE_X
 
@@ -342,9 +303,6 @@
    */
 #undef LT_OBJDIR
 
-/* Define if you have no native hstrerror() function. */
-#undef NO_HSTRERROR
-
 /* Define to 1 if your C compiler doesn't accept -c and -o together. */
 #undef NO_MINUS_C_MINUS_O
 
@@ -358,7 +316,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.36.1"
+#define PACKAGE_STRING "GStreamer Base Plug-ins 0.11.2.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "gst-plugins-base"
@@ -367,13 +325,13 @@
 #undef PACKAGE_URL
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.10.36.1"
+#define PACKAGE_VERSION "0.11.2.1"
 
 /* directory where plugins are located */
 #ifdef _DEBUG
-#  define PLUGINDIR PREFIX "\\debug\\lib\\gstreamer-0.10"
+#  define PLUGINDIR PREFIX "\\debug\\lib\\gstreamer-0.11"
 #else
-#  define PLUGINDIR PREFIX "\\lib\\gstreamer-0.10"
+#  define PLUGINDIR PREFIX "\\lib\\gstreamer-0.11"
 #endif
 
 /* The size of `char', as computed by sizeof. */
@@ -398,7 +356,7 @@
 #undef USE_TREMOLO
 
 /* Version number of package */
-#define VERSION "0.10.36.1"
+#define VERSION "0.11.2.1"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */