Merge branch 'master' into 0.11

Conflicts:
	ext/a52dec/gsta52dec.c

diff --cc configure.ac
Simple merge

diff --cc ext/a52dec/gsta52dec.c
index 370d11e,3ada93f..161cf5c
--- 1/ext/a52dec/gsta52dec.c
--- 2/ext/a52dec/gsta52dec.c
+++ b/ext/a52dec/gsta52dec.c
@@@ -308,8 -309,8 +308,8 @@@ gst_a52dec_parse (GstAudioDecoder * bde
    bit_rate = a52dec->bit_rate;
    sample_rate = a52dec->sample_rate;
    flags = 0;
-   while (av >= 7) {
+   while (size >= 7) {
 -    length = a52_syncinfo (data, &flags, &sample_rate, &bit_rate);
 +    length = a52_syncinfo ((guint8 *) data, &flags, &sample_rate, &bit_rate);
  
      if (length == 0) {
        /* shift window to re-find sync */

diff --cc ext/amrnb/amrnbdec.c
index a3fe067,bf59d8d..0b9a09c
--- 1/ext/amrnb/amrnbdec.c
--- 2/ext/amrnb/amrnbdec.c
+++ b/ext/amrnb/amrnbdec.c
@@@ -249,10 -257,10 +249,10 @@@ gst_amrnbdec_parse (GstAudioDecoder * d
    gst_audio_decoder_get_parse_state (dec, &sync, &eos);
  
    /* need to peek data to get the size */
-   if (gst_adapter_available (adapter) < 1)
+   if (size < 1)
      return GST_FLOW_ERROR;
  
 -  data = gst_adapter_peek (adapter, 1);
 +  gst_adapter_copy (adapter, head, 0, 1);
  
    /* get size */
    switch (amrnbdec->variant) {

diff --cc ext/amrwbdec/amrwbdec.c
index 6286efc,5335866..5a6e73a
--- 1/ext/amrwbdec/amrwbdec.c
--- 2/ext/amrwbdec/amrwbdec.c
+++ b/ext/amrwbdec/amrwbdec.c
@@@ -178,11 -183,11 +178,11 @@@ gst_amrwbdec_parse (GstAudioDecoder * d
    gst_audio_decoder_get_parse_state (dec, &sync, &eos);
  
    /* need to peek data to get the size */
-   if (gst_adapter_available (adapter) < 1)
+   if (size < 1)
      return GST_FLOW_ERROR;
  
 -  data = gst_adapter_peek (adapter, 1);
 -  mode = (data[0] >> 3) & 0x0F;
 +  gst_adapter_copy (adapter, header, 0, 1);
 +  mode = (header[0] >> 3) & 0x0F;
    block = block_size[mode];
  
    GST_DEBUG_OBJECT (amrwbdec, "mode %d, block %d", mode, block);

diff --cc ext/dvdread/dvdreadsrc.c
Simple merge

diff --cc ext/x264/gstx264enc.c
Simple merge