Merge branch 'master' into 0.11

Conflicts:
	configure.ac
	ext/ffmpeg/gstffmpegcodecmap.c

diff --cc configure.ac
index 8c58ec9,655d383..8dad1ea
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -3,7 -3,7 +3,7 @@@ AC_PREREQ(2.60
  dnl initialize autoconf
  dnl when going to/from release please set the nano (fourth number) right !
  dnl releases only do Wall, cvs and prerelease does Werror too
- AC_INIT(GStreamer FFMpeg, 0.11.0.1,
 -AC_INIT(GStreamer Libav, 0.10.12,
++AC_INIT(GStreamer Libav, 0.11.0.1,
      http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
      gst-ffmpeg)
  

diff --cc ext/ffmpeg/gstffmpegcodecmap.c
index 6fde7b6,42cad1a..c62cb42
--- 1/ext/ffmpeg/gstffmpegcodecmap.c
--- 2/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@@ -2303,9 -2387,7 +2303,9 @@@ gst_ffmpeg_caps_with_codecid (enum Code
      }
  
      GST_DEBUG ("have codec data of size %d", size);
-   } else if (context->extradata == NULL) {
 +
 +    gst_buffer_unmap (buf, data, size);
+   } else if (context->extradata == NULL && codec_id != CODEC_ID_AAC_LATM) {
      /* no extradata, alloc dummy with 0 sized, some codecs insist on reading
       * extradata anyway which makes then segfault. */
      context->extradata =