Michael Niedermayer 3b0ad040b3 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  log: Include io.h on windows
  lavr: x86: merge some branches
  x86: cpu: whitespace (mostly) cosmetics
  x86: fft: win64: fix stack alignment for memcpy() call

Conflicts:
	libavutil/log.c

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

2012-06-26 01:13:07 +02:00

..

bswap.h

Merge remote-tracking branch 'qatar/master'

2012-06-25 16:55:31 +02:00

cpu.c

Merge remote-tracking branch 'qatar/master'

2012-06-26 01:13:07 +02:00

float_dsp_init.c

Merge remote-tracking branch 'qatar/master'

2012-06-19 20:53:27 +02:00

float_dsp.asm

Merge remote-tracking branch 'qatar/master'

2012-06-19 20:53:27 +02:00

intmath.h

x86/intmath.h: Fix mull operand constraints

2012-06-26 01:08:35 +02:00

intreadwrite.h

…

Makefile

Add a float DSP framework to libavutil

2012-06-08 13:14:38 -04:00

timer.h

…

w64xmmtest.h

…

x86inc.asm

…

x86util.asm

Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'

2012-05-30 01:40:54 +02:00