Merge branch '0.10'

diff --cc gst/playback/gstplaybin2.c
Simple merge

diff --cc gst/playback/gstplaysink.c
index 454396b3adc29b497b1f3f8286529fc072ed79d3,7e2f0d809773b274244455a7d94288f63ae9421e..24bca4dd83871ab2976c1793412a12ca094e3e41
--- 1/gst/playback/gstplaysink.c
--- 2/gst/playback/gstplaysink.c
+++ b/gst/playback/gstplaysink.c
@@@ -206,15 -242,16 +241,16 @@@ struct _GstPlaySin
    gboolean volume_changed;      /* volume/mute changed while no audiochain */
    gboolean mute_changed;        /* ... has been created yet */
    gint64 av_offset;
+   GstPlaySinkSendEventMode send_event_mode;
  
 -  /* xoverlay proxy interface */
 -  GstXOverlay *xoverlay_element;        /* protected with LOCK */
 -  gboolean xoverlay_handle_set;
 -  guintptr xoverlay_handle;
 -  gboolean xoverlay_render_rectangle_set;
 -  gint xoverlay_x, xoverlay_y, xoverlay_width, xoverlay_height;
 -  gboolean xoverlay_handle_events_set;
 -  gboolean xoverlay_handle_events;
 +  /* videooverlay proxy interface */
 +  GstVideoOverlay *overlay_element;     /* protected with LOCK */
 +  gboolean overlay_handle_set;
 +  guintptr overlay_handle;
 +  gboolean overlay_render_rectangle_set;
 +  gint overlay_x, overlay_y, overlay_width, overlay_height;
 +  gboolean overlay_handle_events_set;
 +  gboolean overlay_handle_events;
  
    /* colorbalance proxy interface */
    GstColorBalance *colorbalance_element;