Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 25 Jun 2012 23:13:07 +0000 (01:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 25 Jun 2012 23:13:07 +0000 (01:13 +0200)
commit3b0ad040b3bffaea5c5fd36bfddd9a436bc6c9c4
tree577f31caa05926e2a6ba6daf16397a9a2768f09d
parent9b72041f805ed71a88182449984e3975fc76ceca
parent246154a9aff222b80befd65faf97494ce9113306
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>
libavcodec/x86/fft_mmx.asm
libavutil/log.c
libavutil/x86/cpu.c