Merge branch 'master' of ssh://git.freedesktop.org/git/gstreamer/gst-plugins-good

diff --cc gst/udp/gstudpnetutils.c
index 07268509e20c3a168757326941d2ec0427f30fd9,b1f864e394dbb08035112fa82e0e5664a2c06520..5fa7593afa8116b82a58e8e3dfd34fb2e423c9f7
--- 1/gst/udp/gstudpnetutils.c
--- 2/gst/udp/gstudpnetutils.c
+++ b/gst/udp/gstudpnetutils.c
@@@ -149,13 -154,8 +154,12 @@@ gst_udp_set_loop_ttl (int sockfd, gbool
        break;
      }
      default:
 +#ifdef G_OS_WIN32
 +      WSASetLastError (WSAEAFNOSUPPORT);
 +#else
        errno = EAFNOSUPPORT;
 +#endif
    }
- #endif
    return ret;
  }