Merge branch 'master' into 0.11

diff --cc gst/avi/gstavidemux.c
index 6b979b7,8ada527..604ae1e
--- 1/gst/avi/gstavidemux.c
--- 2/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@@ -4417,14 -4472,11 +4417,14 @@@ gst_avi_demux_invert (GstAviStream * st
  
    h = stream->strf.vids->height;
    w = stream->strf.vids->width;
-   stride = w * (bpp / 8);
+   stride = GST_ROUND_UP_4 (w * (bpp / 8));
  
    buf = gst_buffer_make_writable (buf);
 -  if (GST_BUFFER_SIZE (buf) < (stride * h)) {
 +
 +  data = gst_buffer_map (buf, &size, NULL, GST_MAP_READWRITE);
 +  if (size < (stride * h)) {
      GST_WARNING ("Buffer is smaller than reported Width x Height x Depth");
 +    gst_buffer_unmap (buf, data, size);
      return buf;
    }