Merge commit '26d6add9457f00ce8ec13844368466f0e3816e5d' into 0.11

Conflicts:
	ext/rtmp/gstrtmpsink.c

diff --cc ext/rtmp/gstrtmpsink.c
index df395aa,db06684..23d580c
--- 1/ext/rtmp/gstrtmpsink.c
--- 2/ext/rtmp/gstrtmpsink.c
+++ b/ext/rtmp/gstrtmpsink.c
@@@ -85,13 -118,10 +90,14 @@@ static voi
  gst_rtmp_sink_class_init (GstRTMPSinkClass * klass)
  {
    GObjectClass *gobject_class;
 -  GstBaseSinkClass *gstbasesink_class = (GstBaseSinkClass *) klass;
 +  GstElementClass *gstelement_class;
 +  GstBaseSinkClass *gstbasesink_class;
  
    gobject_class = (GObjectClass *) klass;
 +  gstelement_class = (GstElementClass *) klass;
 +  gstbasesink_class = (GstBaseSinkClass *) klass;
 +
+   gobject_class->finalize = gst_rtmp_sink_finalize;
    gobject_class->set_property = gst_rtmp_sink_set_property;
    gobject_class->get_property = gst_rtmp_sink_get_property;
  
@@@ -118,10 -137,28 +124,28 @@@
   * initialize instance structure
   */
  static void
 -gst_rtmp_sink_init (GstRTMPSink * sink, GstRTMPSinkClass * klass)
 +gst_rtmp_sink_init (GstRTMPSink * sink)
  {
+ #ifdef G_OS_WIN32
+   WSADATA wsa_data;
+ 
+   if (WSAStartup (MAKEWORD (2, 2), &wsa_data) != 0) {
+     GST_ERROR_OBJECT (sink, "WSAStartup failed: 0x%08x", WSAGetLastError ());
+   }
+ #endif
+ }
+ 
+ static void
+ gst_rtmp_sink_finalize (GObject * object)
+ {
+ #ifdef G_OS_WIN32
+   WSACleanup ();
+ #endif
+ 
+   G_OBJECT_CLASS (parent_class)->finalize (object);
  }
  
+ 
  static gboolean
  gst_rtmp_sink_start (GstBaseSink * basesink)
  {

diff --cc ext/rtmp/gstrtmpsrc.c
index 9a30b28,578bd8f..28f5ea5
--- 1/ext/rtmp/gstrtmpsrc.c
--- 2/ext/rtmp/gstrtmpsrc.c
+++ b/ext/rtmp/gstrtmpsrc.c
@@@ -137,8 -155,16 +141,16 @@@ gst_rtmp_src_class_init (GstRTMPSrcClas
  }
  
  static void
 -gst_rtmp_src_init (GstRTMPSrc * rtmpsrc, GstRTMPSrcClass * klass)
 +gst_rtmp_src_init (GstRTMPSrc * rtmpsrc)
  {
+ #ifdef G_OS_WIN32
+   WSADATA wsa_data;
+ 
+   if (WSAStartup (MAKEWORD (2, 2), &wsa_data) != 0) {
+     GST_ERROR_OBJECT (rtmpsrc, "WSAStartup failed: 0x%08x", WSAGetLastError ());
+   }
+ #endif
+ 
    rtmpsrc->cur_offset = 0;
    rtmpsrc->last_timestamp = 0;