Merge branch 'master' into sampler

diff --cc python/lib/moresetuptools.py
index 221f78a,08d5184..3ed526a
--- 1/python/lib/moresetuptools.py
--- 2/python/lib/moresetuptools.py
+++ b/python/lib/moresetuptools.py
@@@ -112,11 -112,9 +112,9 @@@ def add_local_macros(ext, usedouble = F
  def add_external_deps(ext, usedouble = False):
      # loof for additional packages
      print("Info: looking for *optional* additional packages")
 -    packages = ['libavcodec', 'libavformat', 'libavutil',
 -                'libswresample', 'libavresample',
 +    packages = ['libavcodec', 'libavformat', 'libavutil', 'libavresample',
-                 'jack',
                  'sndfile',
-                 'samplerate',
 +                'rubberband',
                  #'fftw3f',
                 ]
      # samplerate only works with float

diff --cc src/io/source_avcodec.c
Simple merge

diff --cc src/wscript_build
index 0f475b1,0a7d72a..dd93009
--- 1/src/wscript_build
--- 2/src/wscript_build
+++ b/src/wscript_build
@@@ -5,9 -5,9 +5,10 @@@ uselib += ['M'
  uselib += ['FFTW3', 'FFTW3F']
  uselib += ['SAMPLERATE']
  uselib += ['SNDFILE']
 +uselib += ['RUBBERBAND']
  uselib += ['AVCODEC']
  uselib += ['AVFORMAT']
+ uselib += ['SWRESAMPLE']
  uselib += ['AVRESAMPLE']
  uselib += ['AVUTIL']
  uselib += ['BLAS']

diff --cc wscript
Simple merge