Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
	sys/v4l2/gstv4l2object.c

diff --cc docs/plugins/gst-plugins-good-plugins-sections.txt
Simple merge

diff --cc gst/audioparsers/gstflacparse.c
Simple merge

diff --cc gst/flv/gstflvdemux.c
Simple merge

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

diff --cc gst/rtp/gstrtpjpegpay.c
index bce6216,eae2840..6898377
--- 1/gst/rtp/gstrtpjpegpay.c
--- 2/gst/rtp/gstrtpjpegpay.c
+++ b/gst/rtp/gstrtpjpegpay.c
@@@ -316,10 -320,10 +316,10 @@@ gst_rtp_jpeg_pay_setcaps (GstRTPBasePay
      if (width <= 0 || width > 2040)
        goto invalid_dimension;
    }
-   pay->width = width / 8;
+   pay->width = GST_ROUND_UP_8 (width) / 8;
  
 -  gst_basertppayload_set_options (basepayload, "video", TRUE, "JPEG", 90000);
 -  res = gst_basertppayload_set_outcaps (basepayload, NULL);
 +  gst_rtp_base_payload_set_options (basepayload, "video", TRUE, "JPEG", 90000);
 +  res = gst_rtp_base_payload_set_outcaps (basepayload, NULL);
  
    return res;
  

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