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)
commit082dd17bd267c39e5a681a78132a1849db70d478
tree8c834c1679ed150d45fae38fe2954abe79ce5ff8
parent8d07bbca6360a938c607dab4dcb333e12f3d915b
parent0cf3505930913d3584b215f6912de04ff41366e0
Merge remote-tracking branch 'qatar/master'

* 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>