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

Conflicts:
	ext/opus/gstopusdec.c
	ext/opus/gstopusparse.c
	gst-libs/gst/video/gstbasevideodecoder.c
	gst-libs/gst/video/gstbasevideodecoder.h

diff --cc ext/opus/gstopusdec.c
index 3a63349,89639b1..b060b22
--- 1/ext/opus/gstopusdec.c
--- 2/ext/opus/gstopusdec.c
+++ b/ext/opus/gstopusdec.c
@@@ -216,10 -222,8 +216,11 @@@ gst_opus_dec_parse_header (GstOpusDec 
    const GstAudioChannelPosition *pos = NULL;
  
    g_return_val_if_fail (gst_opus_header_is_id_header (buf), GST_FLOW_ERROR);
-   g_return_val_if_fail (dec->n_channels != data[9], GST_FLOW_ERROR);
 +
 +  data = gst_buffer_map (buf, NULL, NULL, GST_MAP_READ);
 +
+   g_return_val_if_fail (dec->n_channels == 0
+       || dec->n_channels == data[9], GST_FLOW_ERROR);
  
    dec->n_channels = data[9];
    dec->pre_skip = GST_READ_UINT16_LE (data + 10);

diff --cc ext/opus/gstopusenc.c
Simple merge

diff --cc ext/opus/gstopusheader.c
Simple merge