diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-02 12:31:39 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-02 12:31:39 +0200 |
| commit | 1ce298dac51cb948a7170ed28e8290530cf150f4 (patch) | |
| tree | b6440ff8a032144c67b8a195ba5e711f38f418ae /libavcodec/wmv2.h | |
| parent | b3e5d59537cbd375ca508fe2dfca30bcd2d201d3 (diff) | |
| parent | ebaf571aca2dd6ce3caeeeec4210a3fccd47e7db (diff) | |
| download | ffmpeg-1ce298dac51cb948a7170ed28e8290530cf150f4.tar.gz | |
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>
Diffstat (limited to 'libavcodec/wmv2.h')
0 files changed, 0 insertions, 0 deletions