Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Jan 2013 12:20:14 +0000 (13:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Jan 2013 12:20:23 +0000 (13:20 +0100)
* qatar/master:
  x86: lavr: use the x86inc.asm automatic stack alignment in mixing functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavresample/x86/audio_mix.asm

Simple merge