Merge commit 'ebaf571aca2dd6ce3caeeeec4210a3fccd47e7db'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 10:31:39 +0000 (12:31 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 10:31:39 +0000 (12:31 +0200)
commit1ce298dac51cb948a7170ed28e8290530cf150f4
treeb6440ff8a032144c67b8a195ba5e711f38f418ae
parentb3e5d59537cbd375ca508fe2dfca30bcd2d201d3
parentebaf571aca2dd6ce3caeeeec4210a3fccd47e7db
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>
libavcodec/x86/dct32.asm
libavcodec/x86/dct_init.c