Merge commit 'bbe4a6db44f0b55b424a5cc9d3e89cd88e250450'

* commit 'bbe4a6db44f0b55b424a5cc9d3e89cd88e250450':
  x86inc: Utilize the shadow space on 64-bit Windows

Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

diff --cc libavutil/x86/x86inc.asm
Simple merge