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 13:49:18 -04:00
2012-04-24 21:28:27 -04:00
2012-04-24 21:28:27 -04:00
2012-04-24 21:28:27 -04:00
2012-04-24 21:28:27 -04:00
2012-06-18 10:55:00 -04:00
2012-06-18 10:55:00 -04:00
2012-05-01 13:52:59 -04:00
2012-04-24 21:28:27 -04:00
2012-06-18 10:55:00 -04:00
2012-06-18 10:55:00 -04:00
2012-04-24 21:28:27 -04:00
2012-05-07 14:17:40 +02:00
2012-06-18 10:55:00 -04:00
2012-04-24 21:28:27 -04:00
2012-04-24 21:28:27 -04:00
2012-05-10 02:25:41 +02:00
2012-06-18 10:55:00 -04:00