Merge commit '2c299d4165cd9653153e12270971c2368551b79e'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 10 May 2013 21:16:09 +0000 (23:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 10 May 2013 21:16:09 +0000 (23:16 +0200)
commit5e1278c6401a5e9aef040dd1f458facba4db7e51
tree5d2c0dee58d11424a701810b82e8030abcceb029
parent2a7d71984805d727e9361be4a61132d95c6796b4
parent2c299d4165cd9653153e12270971c2368551b79e
Merge commit '2c299d4165cd9653153e12270971c2368551b79e'

* commit '2c299d4165cd9653153e12270971c2368551b79e':
  x86: sbrdsp: implement SSE2 qmf_pre_shuffle

Conflicts:
libavcodec/x86/sbrdsp.asm
libavcodec/x86/sbrdsp_init.c

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