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)
* 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>
1  2 
libavcodec/x86/dct32.asm
libavcodec/x86/dct_init.c

Simple merge
Simple merge