From b2783a5c5a28567854c438e1c61cd41a062c8c4c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 5 Jun 2009 10:57:44 +0100 Subject: [PATCH] configure: remove AC_C_INLINE which is not needed and causes problems with MSVC See #584835. Also update win32 files while we're at it. --- configure.ac | 3 --- win32/common/_stdint.h | 4 ++-- win32/common/config.h | 17 +++++++---------- win32/common/video-enumtypes.c | 3 +++ 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index 5f2a173..5ebf698 100644 --- a/configure.ac +++ b/configure.ac @@ -217,9 +217,6 @@ dnl *** checks for structures *** dnl *** checks for compiler characteristics *** -dnl make sure we can use "inline" from C code -AC_C_INLINE - dnl *** checks for library functions *** dnl check for fseeko() diff --git a/win32/common/_stdint.h b/win32/common/_stdint.h index 18934d4..ef9abce 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.23" -/* generated using gnu compiler gcc (Ubuntu 4.3.3-5ubuntu4) 4.3.3 */ +#define _GENERATED_STDINT_H "gst-plugins-base 0.10.23.1" +/* generated using gnu compiler gcc (Debian 4.3.3-10) 4.3.3 */ #define _STDINT_HAVE_STDINT_H 1 #include #endif diff --git a/win32/common/config.h b/win32/common/config.h index a0515f8..aa2b9b3 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 source release" +#define GST_PACKAGE_NAME "GStreamer Base Plug-ins git/prerelease" /* package origin */ #define GST_PACKAGE_ORIGIN "Unknown package origin" @@ -224,6 +224,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_REGEX_H +/* Define to enable Schroedinger video codec (used by schro). */ +#undef HAVE_SCHRO + /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H @@ -304,13 +307,13 @@ #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.23" +#define PACKAGE_STRING "GStreamer Base Plug-ins 0.10.23.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gst-plugins-base" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.10.23" +#define PACKAGE_VERSION "0.10.23.1" /* directory where plugins are located */ #ifdef _DEBUG @@ -338,7 +341,7 @@ #undef STDC_HEADERS /* Version number of package */ -#define VERSION "0.10.23" +#define VERSION "0.10.23.1" /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ @@ -363,9 +366,3 @@ /* Define for large files, on AIX-style hosts. */ #undef _LARGE_FILES - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -#undef inline -#endif diff --git a/win32/common/video-enumtypes.c b/win32/common/video-enumtypes.c index 9788695..159e8df 100644 --- a/win32/common/video-enumtypes.c +++ b/win32/common/video-enumtypes.c @@ -31,6 +31,9 @@ gst_video_format_get_type (void) {GST_VIDEO_FORMAT_Y41B, "GST_VIDEO_FORMAT_Y41B", "y41b"}, {GST_VIDEO_FORMAT_Y42B, "GST_VIDEO_FORMAT_Y42B", "y42b"}, {GST_VIDEO_FORMAT_YVYU, "GST_VIDEO_FORMAT_YVYU", "yvyu"}, + {GST_VIDEO_FORMAT_Y444, "GST_VIDEO_FORMAT_Y444", "y444"}, + {GST_VIDEO_FORMAT_v210, "GST_VIDEO_FORMAT_v210", "v210"}, + {GST_VIDEO_FORMAT_v216, "GST_VIDEO_FORMAT_v216", "v216"}, {0, NULL, NULL} }; etype = g_enum_register_static ("GstVideoFormat", values); -- 2.7.4