Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Nov 2012 12:35:11 +0000 (13:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Nov 2012 12:35:15 +0000 (13:35 +0100)
commit0c79a3d9cb0c7a7acef30b7c01e9337ba91a4a81
tree44cedc0449c8fd89f6915a2c26df52d59787c335
parentd0a503c97cc59b17e77585a726448dfa46245f4d
parent7a9e65aceee678ee2677480579cb3b2208474140
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: lavr: fix stack allocation for 7 and 8 channel downmixing on x86-32
  lavr: fix the decision for writing directly to the output buffer
  parisc: work around bug in gcc 4.3 and later

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavresample/utils.c
libavresample/x86/audio_mix.asm