Merge branch 'master' into 0.11

diff --cc gst/audiofx/audioecho.c
Simple merge

diff --cc gst/audioparsers/gstac3parse.c
index 9569806,663ab31..32158e4
--- 1/gst/audioparsers/gstac3parse.c
--- 2/gst/audioparsers/gstac3parse.c
+++ b/gst/audioparsers/gstac3parse.c
@@@ -204,9 -208,9 +204,9 @@@ gst_ac3_parse_reset (GstAc3Parse * ac3p
  }
  
  static void
 -gst_ac3_parse_init (GstAc3Parse * ac3parse, GstAc3ParseClass * klass)
 +gst_ac3_parse_init (GstAc3Parse * ac3parse)
  {
-   gst_base_parse_set_min_frame_size (GST_BASE_PARSE (ac3parse), 64 * 2);
+   gst_base_parse_set_min_frame_size (GST_BASE_PARSE (ac3parse), 6);
    gst_ac3_parse_reset (ac3parse);
  }
  

diff --cc gst/audioparsers/gstmpegaudioparse.c
index badc901,94a8993..c5b0a8e
--- 1/gst/audioparsers/gstmpegaudioparse.c
--- 2/gst/audioparsers/gstmpegaudioparse.c
+++ b/gst/audioparsers/gstmpegaudioparse.c
@@@ -555,15 -553,14 +557,18 @@@ gst_mpeg_audio_parse_check_valid_frame 
    } else if (draining && lost_sync && caps_change && mp3parse->rate > 0) {
      /* avoid caps jitter that we can't be sure of */
      *skipsize = off + 2;
 -    return FALSE;
 +    goto cleanup;
    }
  
+   /* restore default minimum */
+   gst_base_parse_set_min_frame_size (parse, MIN_FRAME_SIZE);
+ 
    *framesize = bpf;
 -  return TRUE;
 +  res = TRUE;
 +
 +cleanup:
 +  gst_buffer_unmap (buf, data, bufsize);
 +  return res;
  }
  
  static void