Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 17 Feb 2012 22:46:17 +0000 (23:46 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 17 Feb 2012 22:46:17 +0000 (23:46 +0100)
Conflicts:
gst-libs/gst/rtsp/gstrtspconnection.c
win32/common/libgstaudio.def

1  2 
docs/libs/gst-plugins-base-libs-sections.txt
gst-libs/gst/audio/gstaudiodecoder.c
gst-libs/gst/rtsp/gstrtspconnection.c

Simple merge
@@@ -3320,10 -3490,8 +3320,10 @@@ gst_rtsp_watch_write_data (GstRTSPWatc
    g_mutex_lock (watch->mutex);
  
    /* try to send the message synchronously first */
-   if (watch->messages->length == 0) {
+   if (watch->messages->length == 0 && watch->write_data == NULL) {
 -    res = write_bytes (watch->writefd.fd, data, &off, size);
 +    res =
 +        write_bytes (watch->conn->write_socket, data, &off, size,
 +        watch->conn->cancellable);
      if (res != GST_RTSP_EINTR) {
        if (id != NULL)
          *id = 0;