[FFmpeg-cvslog] Merge commit '4a7af92cc80ced8498626401ed21f25ffe6740c8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May  4 10:06:10 2013 +0200| [711c8ee71d719d6d89a523618f078bb17dbe1abf] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=711c8ee71d719d6d89a523618f078bb17dbe1abf
---