Merge commit 'ebaf571aca2dd6ce3caeeeec4210a3fccd47e7db'

* commit 'ebaf571aca2dd6ce3caeeeec4210a3fccd47e7db':
  x86: dct: Disable dct32_float_sse on x86-64

Conflicts:
	libavcodec/x86/dct32.asm
	libavcodec/x86/dct_init.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --cc libavcodec/x86/dct32.asm
Simple merge

diff --cc libavcodec/x86/dct_init.c
Simple merge