Merge branch 'master' into 0.11

Conflicts:
	ext/jpeg/gstjpegdec.c
	gst/rtp/gstrtpvrawpay.c

diff --cc ext/jpeg/gstjpegdec.c
index 170435e,2770696..dceb7e7
--- 1/ext/jpeg/gstjpegdec.c
--- 2/ext/jpeg/gstjpegdec.c
+++ b/ext/jpeg/gstjpegdec.c
@@@ -92,6 -112,8 +92,7 @@@ static void gst_jpeg_dec_get_property (
      GValue * value, GParamSpec * pspec);
  
  static GstFlowReturn gst_jpeg_dec_chain (GstPad * pad, GstBuffer * buffer);
 -static gboolean gst_jpeg_dec_setcaps (GstPad * pad, GstCaps * caps);
+ static GstCaps *gst_jpeg_dec_getcaps (GstPad * pad);
  static gboolean gst_jpeg_dec_sink_event (GstPad * pad, GstEvent * event);
  static gboolean gst_jpeg_dec_src_event (GstPad * pad, GstEvent * event);
  static GstStateChangeReturn gst_jpeg_dec_change_state (GstElement * element,
@@@ -356,6 -405,10 +357,8 @@@ gst_jpeg_dec_init (GstJpegDec * dec
        gst_pad_new_from_static_template (&gst_jpeg_dec_sink_pad_template,
        "sink");
    gst_element_add_pad (GST_ELEMENT (dec), dec->sinkpad);
 -  gst_pad_set_setcaps_function (dec->sinkpad,
 -      GST_DEBUG_FUNCPTR (gst_jpeg_dec_setcaps));
+   gst_pad_set_getcaps_function (dec->sinkpad,
+       GST_DEBUG_FUNCPTR (gst_jpeg_dec_getcaps));
    gst_pad_set_chain_function (dec->sinkpad,
        GST_DEBUG_FUNCPTR (gst_jpeg_dec_chain));
    gst_pad_set_event_function (dec->sinkpad,
@@@ -717,6 -772,50 +720,50 @@@ gst_jpeg_dec_setcaps (GstJpegDec * dec
    return TRUE;
  }
  
 -gst_jpeg_dec_getcaps (GstPad * pad)
+ static GstCaps *
 -    peer_caps = gst_pad_get_caps (peer);
++gst_jpeg_dec_getcaps (GstPad * pad, GstCaps * filter)
+ {
+   GstJpegDec *dec;
+   GstCaps *caps;
+   GstPad *peer;
+ 
+   dec = GST_JPEG_DEC (GST_OBJECT_PARENT (pad));
+ 
+   if (GST_PAD_CAPS (pad))
+     return gst_caps_ref (GST_PAD_CAPS (pad));
+ 
+   peer = gst_pad_get_peer (dec->srcpad);
+ 
+   if (peer) {
+     GstCaps *peer_caps;
+     const GstCaps *templ_caps;
+     GstStructure *s;
+     guint i, n;
+ 
++    peer_caps = gst_pad_get_caps (peer, filter);
+ 
+     /* Translate peercaps to image/jpeg */
+     peer_caps = gst_caps_make_writable (peer_caps);
+     n = gst_caps_get_size (peer_caps);
+     for (i = 0; i < n; i++) {
+       s = gst_caps_get_structure (peer_caps, i);
+ 
+       gst_structure_set_name (s, "image/jpeg");
+     }
+ 
+     templ_caps = gst_pad_get_pad_template_caps (pad);
+     caps = gst_caps_intersect_full (peer_caps, templ_caps,
+         GST_CAPS_INTERSECT_FIRST);
+ 
+     gst_object_unref (peer);
+   } else {
+     caps = gst_caps_copy (gst_pad_get_pad_template_caps (pad));
+   }
+ 
+   return caps;
+ }
+ 
+ 
  /* yuk */
  static void
  hresamplecpy1 (guint8 * dest, const guint8 * src, guint len)

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