Merge commit '15748773bf33c110e6e2e9526c7ba5478274c74c'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Oct 2013 13:36:57 +0000 (15:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Oct 2013 13:37:26 +0000 (15:37 +0200)
commit12ca544aa0fc825ce663af013b13ca5d7c05e46b
treedbeae280cd969b0e1edc67def0333bba5905f52f
parent953dd72321b7eb651351eb46d7c333cb097d18bb
parent15748773bf33c110e6e2e9526c7ba5478274c74c
Merge commit '15748773bf33c110e6e2e9526c7ba5478274c74c'

* commit '15748773bf33c110e6e2e9526c7ba5478274c74c':
  avresample/x86: Switch operand order for mulps

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