diff options
author | Sebastian Dröge <slomo@circular-chaos.org> | 2013-07-30 08:18:47 +0200 |
---|---|---|
committer | Sebastian Dröge <slomo@circular-chaos.org> | 2013-07-30 08:18:47 +0200 |
commit | ab458c2ee68b132b62e498fcf293c2ec44477faf (patch) | |
tree | a2455400f05646458d97021f31202134f0f1dd11 /win32/common | |
parent | 01f23673f675e49cdadf2007671a14835c7b2698 (diff) |
Imported Upstream version 1.1.3upstream/1.1.3
Diffstat (limited to 'win32/common')
-rw-r--r-- | win32/common/config.h | 8 | ||||
-rw-r--r-- | win32/common/gstenumtypes.c | 19 | ||||
-rw-r--r-- | win32/common/gstenumtypes.h | 2 | ||||
-rw-r--r-- | win32/common/gstversion.h | 2 | ||||
-rw-r--r-- | win32/common/libgstbase.def | 1 | ||||
-rw-r--r-- | win32/common/libgstreamer.def | 10 |
6 files changed, 37 insertions, 5 deletions
diff --git a/win32/common/config.h b/win32/common/config.h index b0fe69d..1818c19 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -62,7 +62,7 @@ #define GST_PACKAGE_ORIGIN "Unknown package origin" /* GStreamer package release date/time for plugins as YYYY-MM-DD */ -#define GST_PACKAGE_RELEASE_DATETIME "2013-07-11" +#define GST_PACKAGE_RELEASE_DATETIME "2013-07-29" /* Define if static plugins should be built */ #undef GST_PLUGIN_BUILD_STATIC @@ -357,7 +357,7 @@ #define PACKAGE_NAME "GStreamer" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GStreamer 1.1.2" +#define PACKAGE_STRING "GStreamer 1.1.3" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gstreamer" @@ -366,7 +366,7 @@ #undef PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.1.2" +#define PACKAGE_VERSION "1.1.3" /* directory where plugins are located */ #ifdef _DEBUG @@ -404,7 +404,7 @@ #undef USE_POISONING /* Version number of package */ -#define VERSION "1.1.2" +#define VERSION "1.1.3" /* 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/gstenumtypes.c b/win32/common/gstenumtypes.c index 9a54a03..508a9cd 100644 --- a/win32/common/gstenumtypes.c +++ b/win32/common/gstenumtypes.c @@ -755,6 +755,25 @@ gst_debug_color_flags_get_type (void) return (GType) id; } +GType +gst_debug_color_mode_get_type (void) +{ + static gsize id = 0; + static const GEnumValue values[] = { + {C_ENUM (GST_DEBUG_COLOR_MODE_OFF), "GST_DEBUG_COLOR_MODE_OFF", "off"}, + {C_ENUM (GST_DEBUG_COLOR_MODE_ON), "GST_DEBUG_COLOR_MODE_ON", "on"}, + {C_ENUM (GST_DEBUG_COLOR_MODE_UNIX), "GST_DEBUG_COLOR_MODE_UNIX", "unix"}, + {0, NULL, NULL} + }; + + if (g_once_init_enter (&id)) { + GType tmp = g_enum_register_static ("GstDebugColorMode", values); + g_once_init_leave (&id, tmp); + } + + return (GType) id; +} + /* enumerations from "gstiterator.h" */ GType gst_iterator_result_get_type (void) diff --git a/win32/common/gstenumtypes.h b/win32/common/gstenumtypes.h index d015fa0..b10187f 100644 --- a/win32/common/gstenumtypes.h +++ b/win32/common/gstenumtypes.h @@ -93,6 +93,8 @@ GType gst_debug_level_get_type (void); #define GST_TYPE_DEBUG_LEVEL (gst_debug_level_get_type()) GType gst_debug_color_flags_get_type (void); #define GST_TYPE_DEBUG_COLOR_FLAGS (gst_debug_color_flags_get_type()) +GType gst_debug_color_mode_get_type (void); +#define GST_TYPE_DEBUG_COLOR_MODE (gst_debug_color_mode_get_type()) /* enumerations from "gstiterator.h" */ GType gst_iterator_result_get_type (void); diff --git a/win32/common/gstversion.h b/win32/common/gstversion.h index 81a4eab..4991109 100644 --- a/win32/common/gstversion.h +++ b/win32/common/gstversion.h @@ -57,7 +57,7 @@ G_BEGIN_DECLS * * The micro version of GStreamer at compile time: */ -#define GST_VERSION_MICRO (2) +#define GST_VERSION_MICRO (3) /** * GST_VERSION_NANO: * diff --git a/win32/common/libgstbase.def b/win32/common/libgstbase.def index 7044ad5..09a13ab 100644 --- a/win32/common/libgstbase.def +++ b/win32/common/libgstbase.def @@ -16,6 +16,7 @@ EXPORTS gst_adapter_push gst_adapter_take gst_adapter_take_buffer + gst_adapter_take_buffer_fast gst_adapter_take_list gst_adapter_unmap gst_base_parse_add_index_entry diff --git a/win32/common/libgstreamer.def b/win32/common/libgstreamer.def index 4f89ad1..55a3616 100644 --- a/win32/common/libgstreamer.def +++ b/win32/common/libgstreamer.def @@ -358,9 +358,11 @@ EXPORTS gst_debug_category_reset_threshold gst_debug_category_set_threshold gst_debug_color_flags_get_type + gst_debug_color_mode_get_type gst_debug_construct_term_color gst_debug_construct_win_color gst_debug_get_all_categories + gst_debug_get_color_mode gst_debug_get_default_threshold gst_debug_graph_details_get_type gst_debug_is_active @@ -375,6 +377,8 @@ EXPORTS gst_debug_remove_log_function gst_debug_remove_log_function_by_data gst_debug_set_active + gst_debug_set_color_mode + gst_debug_set_color_mode_from_string gst_debug_set_colored gst_debug_set_default_threshold gst_debug_set_threshold_for_name @@ -499,6 +503,7 @@ EXPORTS gst_event_parse_context gst_event_parse_flush_stop gst_event_parse_gap + gst_event_parse_group_id gst_event_parse_latency gst_event_parse_qos gst_event_parse_seek @@ -511,6 +516,7 @@ EXPORTS gst_event_parse_tag gst_event_parse_toc gst_event_parse_toc_select + gst_event_set_group_id gst_event_set_seqnum gst_event_set_stream_flags gst_event_type_flags_get_type @@ -629,6 +635,7 @@ EXPORTS gst_message_parse_clock_lost gst_message_parse_clock_provide gst_message_parse_error + gst_message_parse_group_id gst_message_parse_have_context gst_message_parse_info gst_message_parse_new_clock @@ -650,6 +657,7 @@ EXPORTS gst_message_parse_toc gst_message_parse_warning gst_message_set_buffering_stats + gst_message_set_group_id gst_message_set_qos_stats gst_message_set_qos_values gst_message_set_seqnum @@ -922,6 +930,7 @@ EXPORTS gst_query_get_n_scheduling_modes gst_query_get_structure gst_query_get_type + gst_query_has_context_type gst_query_has_scheduling_mode gst_query_has_scheduling_mode_with_flags gst_query_new_accept_caps @@ -1286,6 +1295,7 @@ EXPORTS gst_util_get_timestamp gst_util_greatest_common_divisor gst_util_greatest_common_divisor_int64 + gst_util_group_id_next gst_util_guint64_to_gdouble gst_util_seqnum_compare gst_util_seqnum_next |