summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
Diffstat (limited to 'win32')
-rw-r--r--win32/common/_stdint.h4
-rw-r--r--win32/common/audio-enumtypes.c29
-rw-r--r--win32/common/audio-enumtypes.h6
-rw-r--r--win32/common/config.h11
-rw-r--r--win32/common/video-enumtypes.c3
5 files changed, 29 insertions, 24 deletions
diff --git a/win32/common/_stdint.h b/win32/common/_stdint.h
index 06e809ad04..850c1bdbe6 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 1.7.1"
-/* generated using gnu compiler gcc-5 (Debian 5.3.1-4) 5.3.1 20151219 */
+#define _GENERATED_STDINT_H "gst-plugins-base 1.7.2"
+/* generated using gnu compiler gcc-6 (Debian 6-20160205-1) 6.0.0 20160205 (experimental) [trunk revision 233183] */
#define _STDINT_HAVE_STDINT_H 1
#include <stdint.h>
#endif
diff --git a/win32/common/audio-enumtypes.c b/win32/common/audio-enumtypes.c
index c113912ded..0514120f95 100644
--- a/win32/common/audio-enumtypes.c
+++ b/win32/common/audio-enumtypes.c
@@ -6,7 +6,7 @@
#include "audio.h"
#include "audio-format.h"
#include "audio-channels.h"
-#include "audio-channel-mix.h"
+#include "audio-channel-mixer.h"
#include "audio-converter.h"
#include "audio-info.h"
#include "audio-quantize.h"
@@ -196,25 +196,26 @@ gst_audio_channel_position_get_type (void)
return g_define_type_id__volatile;
}
-/* enumerations from "audio-channel-mix.h" */
+/* enumerations from "audio-channel-mixer.h" */
GType
-gst_audio_channel_mix_flags_get_type (void)
+gst_audio_channel_mixer_flags_get_type (void)
{
static volatile gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile)) {
static const GFlagsValue values[] = {
- {GST_AUDIO_CHANNEL_MIX_FLAGS_NONE, "GST_AUDIO_CHANNEL_MIX_FLAGS_NONE",
+ {GST_AUDIO_CHANNEL_MIXER_FLAGS_NONE, "GST_AUDIO_CHANNEL_MIXER_FLAGS_NONE",
"none"},
- {GST_AUDIO_CHANNEL_MIX_FLAGS_NON_INTERLEAVED,
- "GST_AUDIO_CHANNEL_MIX_FLAGS_NON_INTERLEAVED", "non-interleaved"},
- {GST_AUDIO_CHANNEL_MIX_FLAGS_UNPOSITIONED_IN,
- "GST_AUDIO_CHANNEL_MIX_FLAGS_UNPOSITIONED_IN", "unpositioned-in"},
- {GST_AUDIO_CHANNEL_MIX_FLAGS_UNPOSITIONED_OUT,
- "GST_AUDIO_CHANNEL_MIX_FLAGS_UNPOSITIONED_OUT", "unpositioned-out"},
+ {GST_AUDIO_CHANNEL_MIXER_FLAGS_NON_INTERLEAVED,
+ "GST_AUDIO_CHANNEL_MIXER_FLAGS_NON_INTERLEAVED", "non-interleaved"},
+ {GST_AUDIO_CHANNEL_MIXER_FLAGS_UNPOSITIONED_IN,
+ "GST_AUDIO_CHANNEL_MIXER_FLAGS_UNPOSITIONED_IN", "unpositioned-in"},
+ {GST_AUDIO_CHANNEL_MIXER_FLAGS_UNPOSITIONED_OUT,
+ "GST_AUDIO_CHANNEL_MIXER_FLAGS_UNPOSITIONED_OUT",
+ "unpositioned-out"},
{0, NULL, NULL}
};
GType g_define_type_id =
- g_flags_register_static ("GstAudioChannelMixFlags", values);
+ g_flags_register_static ("GstAudioChannelMixerFlags", values);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
return g_define_type_id__volatile;
@@ -228,8 +229,10 @@ gst_audio_converter_flags_get_type (void)
if (g_once_init_enter (&g_define_type_id__volatile)) {
static const GFlagsValue values[] = {
{GST_AUDIO_CONVERTER_FLAG_NONE, "GST_AUDIO_CONVERTER_FLAG_NONE", "none"},
- {GST_AUDIO_CONVERTER_FLAG_SOURCE_WRITABLE,
- "GST_AUDIO_CONVERTER_FLAG_SOURCE_WRITABLE", "source-writable"},
+ {GST_AUDIO_CONVERTER_FLAG_IN_WRITABLE,
+ "GST_AUDIO_CONVERTER_FLAG_IN_WRITABLE", "in-writable"},
+ {GST_AUDIO_CONVERTER_FLAG_VARIABLE_RATE,
+ "GST_AUDIO_CONVERTER_FLAG_VARIABLE_RATE", "variable-rate"},
{0, NULL, NULL}
};
GType g_define_type_id =
diff --git a/win32/common/audio-enumtypes.h b/win32/common/audio-enumtypes.h
index 1b51e1c886..7d0386154a 100644
--- a/win32/common/audio-enumtypes.h
+++ b/win32/common/audio-enumtypes.h
@@ -20,9 +20,9 @@ GType gst_audio_pack_flags_get_type (void);
GType gst_audio_channel_position_get_type (void);
#define GST_TYPE_AUDIO_CHANNEL_POSITION (gst_audio_channel_position_get_type())
-/* enumerations from "audio-channel-mix.h" */
-GType gst_audio_channel_mix_flags_get_type (void);
-#define GST_TYPE_AUDIO_CHANNEL_MIX_FLAGS (gst_audio_channel_mix_flags_get_type())
+/* enumerations from "audio-channel-mixer.h" */
+GType gst_audio_channel_mixer_flags_get_type (void);
+#define GST_TYPE_AUDIO_CHANNEL_MIXER_FLAGS (gst_audio_channel_mixer_flags_get_type())
/* enumerations from "audio-converter.h" */
GType gst_audio_converter_flags_get_type (void);
diff --git a/win32/common/config.h b/win32/common/config.h
index e9feeec434..93565714d8 100644
--- a/win32/common/config.h
+++ b/win32/common/config.h
@@ -90,7 +90,7 @@
#define GST_PACKAGE_ORIGIN "Unknown package origin"
/* GStreamer package release date/time for plugins as YYYY-MM-DD */
-#define GST_PACKAGE_RELEASE_DATETIME "2015-12-24"
+#define GST_PACKAGE_RELEASE_DATETIME "2016-02-19"
/* Define if static plugins should be built */
#undef GST_PLUGIN_BUILD_STATIC
@@ -323,8 +323,7 @@
/* gettext locale dir */
#define LOCALEDIR PREFIX "\\share\\locale"
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* Name of package */
@@ -337,7 +336,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 1.7.1"
+#define PACKAGE_STRING "GStreamer Base Plug-ins 1.7.2"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "gst-plugins-base"
@@ -346,7 +345,7 @@
#undef PACKAGE_URL
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.7.1"
+#define PACKAGE_VERSION "1.7.2"
/* directory where plugins are located */
#ifdef _DEBUG
@@ -380,7 +379,7 @@
#undef USE_TREMOLO
/* Version number of package */
-#define VERSION "1.7.1"
+#define VERSION "1.7.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 e82b178aa8..bade1905ca 100644
--- a/win32/common/video-enumtypes.c
+++ b/win32/common/video-enumtypes.c
@@ -205,6 +205,7 @@ gst_video_transfer_function_get_type (void)
{GST_VIDEO_TRANSFER_LOG316, "GST_VIDEO_TRANSFER_LOG316", "log316"},
{GST_VIDEO_TRANSFER_BT2020_12, "GST_VIDEO_TRANSFER_BT2020_12",
"bt2020-12"},
+ {GST_VIDEO_TRANSFER_ADOBERGB, "GST_VIDEO_TRANSFER_ADOBERGB", "adobergb"},
{0, NULL, NULL}
};
GType g_define_type_id =
@@ -236,6 +237,8 @@ gst_video_color_primaries_get_type (void)
"film"},
{GST_VIDEO_COLOR_PRIMARIES_BT2020, "GST_VIDEO_COLOR_PRIMARIES_BT2020",
"bt2020"},
+ {GST_VIDEO_COLOR_PRIMARIES_ADOBERGB, "GST_VIDEO_COLOR_PRIMARIES_ADOBERGB",
+ "adobergb"},
{0, NULL, NULL}
};
GType g_define_type_id =