Merge branch 'master' into 0.11

diff --combined configure.ac
index dda50d4c9c020fc856dc5b9eaa98ee94d2500074,03a367be7757a266fba6adac0f00aa594f65f728..a82ddb72db0213743fb01e387024d47b1b66eaeb
--- 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 Bad Plug-ins, 0.10.22.1,
 +AC_INIT(GStreamer Bad Plug-ins, 0.11.0.1,
      http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
      gst-plugins-bad)
  
@@@ -38,7 -38,7 +38,7 @@@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_R
  dnl our libraries and install dirs use major.minor as a version
  GST_MAJORMINOR=$GST_PLUGINS_BAD_VERSION_MAJOR.$GST_PLUGINS_BAD_VERSION_MINOR
  dnl we override it here if we need to for the release candidate of new series
 -GST_MAJORMINOR=0.10
 +GST_MAJORMINOR=0.11
  AC_SUBST(GST_MAJORMINOR)
  
  AG_GST_LIBTOOL_PREPARE
@@@ -52,8 -52,8 +52,8 @@@ AC_LIBTOOL_WIN32_DL
  AM_PROG_LIBTOOL
  
  dnl *** required versions of GStreamer stuff ***
 -GST_REQ=0.10.35.1
 -GSTPB_REQ=0.10.35.1
 +GST_REQ=0.11.0.1
 +GSTPB_REQ=0.11.0.1
  
  dnl *** autotools stuff ****
  
@@@ -194,9 -194,9 +194,9 @@@ AM_CONDITIONAL(HAVE_GST_CHECK, test "x$
  AG_GST_CHECK_GST_PLUGINS_BASE($GST_MAJORMINOR, [$GSTPB_REQ], yes)
  
  dnl check for uninstalled plugin directories for unit tests
 -AG_GST_CHECK_GST_PLUGINS_GOOD($GST_MAJORMINOR, [0.10.25])
 -AG_GST_CHECK_GST_PLUGINS_UGLY($GST_MAJORMINOR, [0.10.16])
 -AG_GST_CHECK_GST_PLUGINS_FFMPEG($GST_MAJORMINOR, [0.10.11])
 +AG_GST_CHECK_GST_PLUGINS_GOOD($GST_MAJORMINOR, [0.11.0])
 +AG_GST_CHECK_GST_PLUGINS_UGLY($GST_MAJORMINOR, [0.11.0])
 +AG_GST_CHECK_GST_PLUGINS_FFMPEG($GST_MAJORMINOR, [0.11.0])
  
  dnl Check for documentation xrefs
  GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
@@@ -291,24 -291,6 +291,24 @@@ dnl used in example
  AG_GST_DEFAULT_ELEMENTS
  
  dnl *** plug-ins to include ***
 +dnl Non ported plugins (non-dependant, then dependant)
 +dnl Make sure you have a space before and after all plugins
 +GST_PLUGINS_NONPORTED=" adpcmdec adpcmenc aiff asfmux \
 + audiovisualizers autoconvert bayer camerabin cdxaparse coloreffects \
 + dataurisrc dccp debugutils dtmf dvbsuboverlay dvdspu faceoverlay festival \
 + fieldanalysis freeze frei0r gaudieffects geometrictransform h264parse \
 + hdvparse hls id3tag interlace ivfparse jpegformat jp2kdecimator \
 + liveadder legacyresample librfb mpegdemux mpegtsdemux mpegtsmux \
 + mpegpsmux mpeg4videoparse mpegvideoparse mve mxf nsf nuvdemux \
 + patchdetect pcapparse pnm rawparse real rtpmux rtpvp8 scaletempo \
 + sdi sdp segmentclip siren speed subenc stereo tta videofilters \
 + videomaxrate videomeasure videoparsers videosignal vmnc y4m \
 + decklink dvb fbdev linsys shm vcd \
 + voaacenc assrender apexsink bz2 cog curl dc1394 dirac dts resindvd \
 + faac faad gsettings jp2k ladspa libmms modplug mpeg2enc mimic \
 + musepack musicbrainz neon rsvg schro sdl sndfile soundtouch \
 + vp8 xvid "
 +AC_SUBST(GST_PLUGINS_NONPORTED)
  
  dnl these are all the gst plug-ins, compilable without additional libs
  AG_GST_CHECK_PLUGIN(adpcmdec)
@@@ -322,6 -304,7 +322,6 @@@ AG_GST_CHECK_PLUGIN(camerabin
  AG_GST_CHECK_PLUGIN(camerabin2)
  AG_GST_CHECK_PLUGIN(cdxaparse)
  AG_GST_CHECK_PLUGIN(coloreffects)
 -AG_GST_CHECK_PLUGIN(colorspace)
  AG_GST_CHECK_PLUGIN(dataurisrc)
  AG_GST_CHECK_PLUGIN(dccp)
  AG_GST_CHECK_PLUGIN(debugutils)
@@@ -1735,6 -1718,17 +1735,17 @@@ AG_GST_CHECK_FEATURE(RTMP, [rtmp librar
    AG_GST_PKG_CHECK_MODULES(RTMP, librtmp)
  ])
  
+ dnl *** spandsp ***
+ translit(dnm, m, l) AM_CONDITIONAL(USE_SPANDSP, true)
+ AG_GST_CHECK_FEATURE(SPANDSP, [Spandsp], spandsp, [
+   PKG_CHECK_MODULES(SPANDSP, spandsp >= 0.0.6, [
+     HAVE_SPANDSP="yes" ], [
+     HAVE_SPANDSP="no"
+   ])
+ ])
+ AC_SUBST(SPANDSP_CFLAGS)
+ AC_SUBST(SPANDSP_LIBS)
+ 
  dnl *** GSettings ***
  translit(dnm, m, l) AM_CONDITIONAL(USE_GSETTINGS, true)
  AG_GST_CHECK_FEATURE(GSETTINGS, [GSettings plugin], gsettings, [
@@@ -1797,6 -1791,7 +1808,7 @@@ AM_CONDITIONAL(USE_WILDMIDI, false
  AM_CONDITIONAL(USE_SDL, false)
  AM_CONDITIONAL(USE_SNDFILE, false)
  AM_CONDITIONAL(USE_SOUNDTOUCH, false)
+ AM_CONDITIONAL(USE_SPANDSP, false)
  AM_CONDITIONAL(USE_SPC, false)
  AM_CONDITIONAL(USE_GME, false)
  AM_CONDITIONAL(USE_GSETTINGS, false)
@@@ -1849,7 -1844,6 +1861,7 @@@ dnl FIXME: do we want to rename to GST_
  dnl prefer internal headers to already installed ones
  dnl also add builddir include for enumtypes and marshal
  dnl add GST_OPTION_CFLAGS, but overridable
 +GST_CFLAGS="$GST_CFLAGS -DGST_USE_UNSTABLE_API"
  GST_CXXFLAGS="$GST_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CXXFLAGS)"
  GST_CFLAGS="$GST_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CFLAGS)"
  AC_SUBST(GST_CFLAGS)
@@@ -1897,6 -1891,7 +1909,6 @@@ gst/bayer/Makefil
  gst/camerabin/Makefile
  gst/camerabin2/Makefile
  gst/cdxaparse/Makefile
 -gst/colorspace/Makefile
  gst/coloreffects/Makefile
  gst/dataurisrc/Makefile
  gst/dccp/Makefile
@@@ -2046,6 -2041,7 +2058,7 @@@ ext/schroedinger/Makefil
  ext/sdl/Makefile
  ext/sndfile/Makefile
  ext/soundtouch/Makefile
+ ext/spandsp/Makefile
  ext/teletextdec/Makefile
  ext/gme/Makefile
  ext/gsettings/Makefile