Merge branch 'master' into 0.11

Conflicts:
	ext/flac/gstflacdec.c
	ext/jpeg/gstjpegenc.c
	ext/pulse/pulsesink.c
	sys/v4l2/gstv4l2src.c

diff --cc configure.ac
Simple merge

diff --cc ext/pulse/pulsesink.c
index 8699ccf,11e9c89..bb7509e
--- 1/ext/pulse/pulsesink.c
--- 2/ext/pulse/pulsesink.c
+++ b/ext/pulse/pulsesink.c
@@@ -2863,9 -2955,12 +2863,12 @@@ gst_pulsesink_change_state (GstElement 
          GST_INFO_OBJECT (element, "new pa main loop thread");
          if (!(mainloop = pa_threaded_mainloop_new ()))
            goto mainloop_failed;
+         if (pa_threaded_mainloop_start (mainloop) < 0) {
+           pa_threaded_mainloop_free (mainloop);
+           goto mainloop_start_failed;
+         }
          mainloop_ref_ct = 1;
-         pa_threaded_mainloop_start (mainloop);
 -        g_mutex_unlock (pa_shared_resource_mutex);
 +        g_mutex_unlock (&pa_shared_resource_mutex);
        } else {
          GST_INFO_OBJECT (element, "reusing pa main loop thread");
          mainloop_ref_ct++;
@@@ -2910,6 -3005,13 +2913,13 @@@ mainloop_failed
          ("pa_threaded_mainloop_new() failed"), (NULL));
      return GST_STATE_CHANGE_FAILURE;
    }
 -    g_mutex_unlock (pa_shared_resource_mutex);
+ mainloop_start_failed:
+   {
++    g_mutex_unlock (&pa_shared_resource_mutex);
+     GST_ELEMENT_ERROR (pulsesink, RESOURCE, FAILED,
+         ("pa_threaded_mainloop_start() failed"), (NULL));
+     return GST_STATE_CHANGE_FAILURE;
+   }
  state_failure:
    {
      if (transition == GST_STATE_CHANGE_NULL_TO_READY) {

diff --cc ext/pulse/pulsesrc.c
Simple merge

diff --cc gst/alpha/gstalphacolor.c
Simple merge

diff --cc gst/avi/gstavidemux.c
index da0943a,43096ff..2717db7
--- 1/gst/avi/gstavidemux.c
--- 2/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@@ -522,10 -573,10 +522,10 @@@ gst_avi_demux_handle_src_query (GstPad 
            GST_DEBUG_OBJECT (query, "total frames is %" G_GUINT32_FORMAT,
                stream->idx_n);
  
-           if (stream->idx_n >= 0)
+           if (stream->idx_n > 0)
              gst_query_set_duration (query, fmt, stream->idx_n);
            else if (gst_pad_query_convert (pad, GST_FORMAT_TIME,
 -                  duration, &fmt, &dur))
 +                  duration, fmt, &dur))
              gst_query_set_duration (query, fmt, dur);
            break;
          }

diff --cc gst/cutter/gstcutter.c
Simple merge

diff --cc gst/deinterlace/gstdeinterlace.c
Simple merge

diff --cc gst/imagefreeze/gstimagefreeze.c
Simple merge

diff --cc gst/isomp4/atomsrecovery.c
Simple merge

diff --cc gst/matroska/matroska-demux.c
Simple merge

diff --cc gst/rtp/gstrtph263ppay.c
index 50e2029,f85607e..b029a3e
--- 1/gst/rtp/gstrtph263ppay.c
--- 2/gst/rtp/gstrtph263ppay.c
+++ b/gst/rtp/gstrtph263ppay.c
@@@ -229,11 -233,10 +229,11 @@@ caps_append (GstCaps * caps, GstStructu
  
  
  static GstCaps *
 -gst_rtp_h263p_pay_sink_getcaps (GstBaseRTPPayload * payload, GstPad * pad)
 +gst_rtp_h263p_pay_sink_getcaps (GstRTPBasePayload * payload, GstPad * pad,
 +    GstCaps * filter)
  {
    GstRtpH263PPay *rtph263ppay;
-   GstCaps *caps = gst_caps_new_empty ();
+   GstCaps *caps = NULL;
    GstCaps *peercaps = NULL;
    GstCaps *intersect = NULL;
    guint i;

diff --cc gst/rtp/gstrtpmp4adepay.c
Simple merge

diff --cc gst/rtp/gstrtptheoradepay.c
Simple merge

diff --cc gst/rtpmanager/gstrtpbin.c
index 45142a5,0b2167d..64fea5b
--- 1/gst/rtpmanager/gstrtpbin.c
--- 2/gst/rtpmanager/gstrtpbin.c
+++ b/gst/rtpmanager/gstrtpbin.c
@@@ -1878,13 -1881,13 +1881,13 @@@ gst_rtp_bin_class_init (GstRtpBinClass 
  }
  
  static void
 -gst_rtp_bin_init (GstRtpBin * rtpbin, GstRtpBinClass * klass)
 +gst_rtp_bin_init (GstRtpBin * rtpbin)
  {
-   gchar *str;
+   gchar *cname;
  
    rtpbin->priv = GST_RTP_BIN_GET_PRIVATE (rtpbin);
 -  rtpbin->priv->bin_lock = g_mutex_new ();
 -  rtpbin->priv->dyn_lock = g_mutex_new ();
 +  g_mutex_init (&rtpbin->priv->bin_lock);
 +  g_mutex_init (&rtpbin->priv->dyn_lock);
  
    rtpbin->latency_ms = DEFAULT_LATENCY_MS;
    rtpbin->latency_ns = DEFAULT_LATENCY_MS * GST_MSECOND;

diff --cc gst/rtpmanager/gstrtpptdemux.c
index 7c24509,630212f..15d525b
--- 1/gst/rtpmanager/gstrtpptdemux.c
--- 2/gst/rtpmanager/gstrtpptdemux.c
+++ b/gst/rtpmanager/gstrtpptdemux.c
@@@ -304,9 -309,8 +304,9 @@@ gst_rtp_pt_demux_chain (GstPad * pad, G
    GstPad *srcpad;
    GstRtpPtDemuxPad *rtpdemuxpad;
    GstCaps *caps;
-   GstRTPBuffer rtp = {NULL};
++  GstRTPBuffer rtp = { NULL };
  
 -  rtpdemux = GST_RTP_PT_DEMUX (GST_OBJECT_PARENT (pad));
 +  rtpdemux = GST_RTP_PT_DEMUX (parent);
  
    if (!gst_rtp_buffer_validate (buf))
      goto invalid_buffer;
@@@ -324,9 -326,13 +324,13 @@@
      GstPadTemplate *templ;
      gchar *padname;
  
+     caps = gst_rtp_pt_demux_get_caps (rtpdemux, pt);
+     if (!caps)
+       goto no_caps;
+ 
      klass = GST_ELEMENT_GET_CLASS (rtpdemux);
 -    templ = gst_element_class_get_pad_template (klass, "src_%d");
 -    padname = g_strdup_printf ("src_%d", pt);
 +    templ = gst_element_class_get_pad_template (klass, "src_%u");
 +    padname = g_strdup_printf ("src_%u", pt);
      srcpad = gst_pad_new_from_template (templ, padname);
      gst_pad_use_fixed_caps (srcpad);
      g_free (padname);

diff --cc gst/rtpmanager/rtpsession.c
Simple merge

diff --cc gst/rtsp/gstrtspsrc.c
index 4f29a06,de14225..677574b
--- 1/gst/rtsp/gstrtspsrc.c
--- 2/gst/rtsp/gstrtspsrc.c
+++ b/gst/rtsp/gstrtspsrc.c
@@@ -1947,16 -2014,11 +1947,12 @@@ gst_rtspsrc_handle_src_event (GstPad * 
  /* this is the final event function we receive on the internal source pad when
   * we deal with TCP connections */
  static gboolean
 -gst_rtspsrc_handle_internal_src_event (GstPad * pad, GstEvent * event)
 +gst_rtspsrc_handle_internal_src_event (GstPad * pad, GstObject * parent,
 +    GstEvent * event)
  {
-   GstRTSPSrc *src;
    gboolean res;
  
-   src = GST_RTSPSRC_CAST (gst_pad_get_element_private (pad));
- 
-   GST_DEBUG_OBJECT (src, "pad %s:%s received event %s",
-       GST_DEBUG_PAD_NAME (pad), GST_EVENT_TYPE_NAME (event));
+   GST_DEBUG_OBJECT (pad, "received event %s", GST_EVENT_TYPE_NAME (event));
  
    switch (GST_EVENT_TYPE (event)) {
      case GST_EVENT_SEEK:

diff --cc sys/oss4/oss4-sink.c
index 1d2220b,54e95b9..81f8d2a
--- 1/sys/oss4/oss4-sink.c
--- 2/sys/oss4/oss4-sink.c
+++ b/sys/oss4/oss4-sink.c
@@@ -476,7 -477,7 +476,7 @@@ gst_oss4_sink_open (GstAudioSink * asin
  
      if (ioctl (oss->fd, SNDCTL_DSP_GET_PLAYTGT_NAMES, &routings) != -1) {
        GST_LOG_OBJECT (oss, "%u output routings (static list: %d)",
--          routings.nvalues, !!(routings.version == 0));
++          routings.nvalues, ! !(routings.version == 0));
        for (i = 0; i < routings.nvalues; ++i) {
          GST_LOG_OBJECT (oss, "  output routing %d: %s", i,
              &routings.strings[routings.strindex[i]]);

diff --cc sys/oss4/oss4-source.c
Simple merge

diff --cc sys/v4l2/gstv4l2src.c
Simple merge

diff --cc sys/waveform/gstwaveformsink.c
Simple merge

diff --cc tests/check/elements/autodetect.c
Simple merge

diff --cc tests/check/elements/videocrop.c
Simple merge