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
..
2012-06-25 16:55:31 +02:00
2012-06-26 01:13:07 +02:00
2012-06-19 20:53:27 +02:00
2012-06-19 20:53:27 +02:00
2012-06-26 01:08:35 +02:00
2011-03-19 13:33:20 +00:00
2012-06-08 13:14:38 -04:00
2011-03-19 13:33:20 +00:00
2012-02-02 12:00:48 -08:00
2012-04-20 21:16:12 +02:00
2012-05-30 01:40:54 +02:00