Michael Niedermayer 711c8ee71d 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>

2013-05-04 10:07:43 +02:00

9.6 KiB

Raw Blame History

View Raw