Merge branch 'master' into 0.11

diff --cc ext/jpeg/gstjpegdec.c
index 41858fb,692b219..ab4ed1a
--- 1/ext/jpeg/gstjpegdec.c
--- 2/ext/jpeg/gstjpegdec.c
+++ b/ext/jpeg/gstjpegdec.c
@@@ -66,12 -66,15 +66,13 @@@ static GstStaticPadTemplate gst_jpeg_de
  GST_STATIC_PAD_TEMPLATE ("src",
      GST_PAD_SRC,
      GST_PAD_ALWAYS,
 -    GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("I420") "; "
 -        GST_VIDEO_CAPS_RGB "; " GST_VIDEO_CAPS_BGR "; "
 -        GST_VIDEO_CAPS_RGBx "; " GST_VIDEO_CAPS_xRGB "; "
 -        GST_VIDEO_CAPS_BGRx "; " GST_VIDEO_CAPS_xBGR "; "
 -        GST_VIDEO_CAPS_GRAY8)
 +    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE
 +        ("{ I420, RGB, BGR, RGBx, xRGB, BGRx, xBGR, GRAY8 }"))
      );
 +
  /* *INDENT-ON* */
  
+ /* FIXME: sof-marker is for IJG libjpeg 8, should be different for 6.2 */
  static GstStaticPadTemplate gst_jpeg_dec_sink_pad_template =
  GST_STATIC_PAD_TEMPLATE ("sink",
      GST_PAD_SINK,

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

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