Merge commit '4a7af92cc80ced8498626401ed21f25ffe6740c8'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 4 May 2013 08:06:10 +0000 (10:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 4 May 2013 08:07:43 +0000 (10:07 +0200)
commit711c8ee71d719d6d89a523618f078bb17dbe1abf
treeb3f74bd4807eade81577b24b2b5c601c110d498f
parentf18d2dff1194b34b79dc7641aafe54d1df349e40
parent4a7af92cc80ced8498626401ed21f25ffe6740c8
Merge commit '4a7af92cc80ced8498626401ed21f25ffe6740c8'

* commit '4a7af92cc80ced8498626401ed21f25ffe6740c8':
  sbrdsp: Unroll and use integer operations
  sbrdsp: Unroll sbr_autocorrelate_c
  x86: sbrdsp: Implement SSE2 qmf_deint_bfly

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

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