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)
* commit '11b2eed43e91b35b8295ed47115cae2e29bd687d':
  lavr: Drop deprecated context reinitialization if resampling was not enabled

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

Simple merge
Simple merge