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

6.4 KiB

Raw Blame History

View Raw