mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-09 14:14:39 +02:00
* 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>