Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Dec 2012 13:11:43 +0000 (14:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Dec 2012 13:11:51 +0000 (14:11 +0100)
* qatar/master:
  avresample: use valid log context in mixing functions
  lavr: remove automatic context close/open for resampling compensation

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge