Merge branch 'master' into 0.11

Conflicts:
	ext/flac/gstflacdec.c

diff --cc ext/flac/gstflacdec.c
index 0f8a675,061fa81..d160a52
--- 1/ext/flac/gstflacdec.c
--- 2/ext/flac/gstflacdec.c
+++ b/ext/flac/gstflacdec.c
@@@ -1392,9 -1391,11 +1396,11 @@@ gst_flac_dec_chain (GstPad * pad, GstBu
  
    dec = GST_FLAC_DEC (GST_PAD_PARENT (pad));
  
-   GST_LOG_OBJECT (dec, "buffer with ts=%" GST_TIME_FORMAT ", end_offset=%"
-       G_GINT64_FORMAT ", size=%u", GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)),
+   GST_LOG_OBJECT (dec,
+       "buffer with ts=%" GST_TIME_FORMAT ", offset=%" G_GINT64_FORMAT
 -      ", end_offset=%" G_GINT64_FORMAT ", size=%u",
++      ", end_offset=%" G_GINT64_FORMAT ", size=%" G_GSIZE_FORMAT,
+       GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)), GST_BUFFER_OFFSET (buf),
 -      GST_BUFFER_OFFSET_END (buf), GST_BUFFER_SIZE (buf));
 +      GST_BUFFER_OFFSET_END (buf), gst_buffer_get_size (buf));
  
    if (dec->init) {
      GST_DEBUG_OBJECT (dec, "initializing decoder");