Merge commit '11b2eed43e91b35b8295ed47115cae2e29bd687d'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 5 Sep 2015 13:59:40 +0000 (15:59 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 5 Sep 2015 13:59:40 +0000 (15:59 +0200)
commite2adb00ec587dd48746b0d24648005d22c91423c
tree15ead55f8dc655070b886d8bed6c5fbb3dd4922c
parentcebe51a6255e04b8dcd15fcbab359ed00dbb3ab1
parent11b2eed43e91b35b8295ed47115cae2e29bd687d
Merge commit '11b2eed43e91b35b8295ed47115cae2e29bd687d'

* commit '11b2eed43e91b35b8295ed47115cae2e29bd687d':
  lavr: Drop deprecated context reinitialization if resampling was not enabled

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavresample/resample.c
libavresample/version.h