Merge branch 'master' into 0.11-fdo

Conflicts:
	gst/gst.c
	libs/gst/base/gstcollectpads.c

diff --cc gst/gst.c
index 1cc273e,adf2239..5227bf2
--- 1/gst/gst.c
--- 2/gst/gst.c
+++ b/gst/gst.c
@@@ -751,17 -747,16 +751,18 @@@ init_post (GOptionContext * context, GO
    g_type_class_ref (gst_parse_flags_get_type ());
    g_type_class_ref (gst_search_mode_get_type ());
    g_type_class_ref (gst_progress_type_get_type ());
 +  g_type_class_ref (gst_buffer_pool_flags_get_type ());
 +  g_type_class_ref (gst_memory_flags_get_type ());
 +  g_type_class_ref (gst_map_flags_get_type ());
+   g_type_class_ref (gst_caps_intersect_mode_get_type ());
  
    gst_structure_get_type ();
 -  _gst_value_initialize ();
 -  g_type_class_ref (gst_param_spec_fraction_get_type ());
 -  gst_caps_get_type ();
    _gst_event_initialize ();
    _gst_buffer_initialize ();
 -  _gst_buffer_list_initialize ();
    _gst_message_initialize ();
 +  _gst_buffer_list_initialize ();
 +  _gst_value_initialize ();
 +  g_type_class_ref (gst_param_spec_fraction_get_type ());
    _gst_tag_initialize ();
  
    _gst_plugin_initialize ();
@@@ -1118,9 -1113,7 +1119,10 @@@ gst_deinit (void
    g_type_class_unref (g_type_class_peek (gst_parse_error_get_type ()));
    g_type_class_unref (g_type_class_peek (gst_param_spec_fraction_get_type ()));
    g_type_class_unref (g_type_class_peek (gst_progress_type_get_type ()));
 +  g_type_class_unref (g_type_class_peek (gst_buffer_pool_flags_get_type ()));
 +  g_type_class_unref (g_type_class_peek (gst_memory_flags_get_type ()));
 +  g_type_class_unref (g_type_class_peek (gst_map_flags_get_type ()));
+   g_type_class_unref (g_type_class_peek (gst_caps_intersect_mode_get_type ()));
  
    gst_deinitialized = TRUE;
    GST_INFO ("deinitialized GStreamer");

diff --cc gst/gstbin.c
Simple merge

diff --cc gst/gstcaps.c
index 9b47f6d,5d8912c..09724d0
--- 1/gst/gstcaps.c
--- 2/gst/gstcaps.c
+++ b/gst/gstcaps.c
@@@ -1322,12 -1427,9 +1312,9 @@@ gst_caps_intersect_zig_zag (const GstCa
    GstCaps *dest;
    GstStructure *istruct;
  
-   g_return_val_if_fail (GST_IS_CAPS (caps1), NULL);
-   g_return_val_if_fail (GST_IS_CAPS (caps2), NULL);
- 
    /* caps are exactly the same pointers, just copy one caps */
    if (G_UNLIKELY (caps1 == caps2))
 -    return gst_caps_copy (caps1);
 +    return _gst_caps_copy (caps1);
  
    /* empty caps on either side, return empty */
    if (G_UNLIKELY (CAPS_IS_EMPTY (caps1) || CAPS_IS_EMPTY (caps2)))

diff --cc gst/gstcaps.h
Simple merge

diff --cc gst/gstelement.h
Simple merge

diff --cc gst/gstevent.h
Simple merge

diff --cc gst/gsttask.h
Simple merge

diff --cc libs/gst/base/gstbasesink.c
Simple merge

diff --cc libs/gst/base/gstbasesrc.c
Simple merge

diff --cc libs/gst/base/gstbasesrc.h
Simple merge

diff --cc libs/gst/base/gstbasetransform.c
Simple merge

diff --cc libs/gst/base/gstbasetransform.h
Simple merge

diff --cc libs/gst/base/gstbytereader.h
Simple merge

diff --cc libs/gst/base/gstbytewriter.h
Simple merge

diff --cc libs/gst/base/gstcollectpads.c
Simple merge

diff --cc plugins/elements/gstfilesrc.c
Simple merge

diff --cc plugins/elements/gstinputselector.c
Simple merge

diff --cc plugins/elements/gstmultiqueue.c
Simple merge

diff --cc plugins/elements/gstqueue2.c
Simple merge

diff --cc tests/check/Makefile.am
index 62a29ff,d006bc7..00ca28d
--- 1/tests/check/Makefile.am
--- 2/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@@ -43,14 -42,9 +43,14 @@@ ABI_CHECKS = gst/gstab
  endif
  endif
  endif
 +endif
 +
 +if FALSE
 +LIBSABI_CHECKS = libs/libsabi
 +endif
  
  if HAVE_CXX
- CXX_CHECKS = gst/gstcpp
+ CXX_CHECKS = gst/gstcpp libs/gstlibscpp
  else
  CXX_CHECKS =
  endif

diff --cc win32/common/libgstreamer.def
index 6ffaf14,c6da075..f1dd76c
--- 1/win32/common/libgstreamer.def
--- 2/win32/common/libgstreamer.def
+++ b/win32/common/libgstreamer.def
@@@ -178,7 -160,10 +178,9 @@@ EXPORT
        gst_caps_from_string
        gst_caps_get_size
        gst_caps_get_structure
 -      gst_caps_get_type
        gst_caps_intersect
+       gst_caps_intersect_full
+       gst_caps_intersect_mode_get_type
        gst_caps_is_always_compatible
        gst_caps_is_any
        gst_caps_is_empty