diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-26 01:13:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-26 01:13:07 +0200 |
| commit | 3b0ad040b3bffaea5c5fd36bfddd9a436bc6c9c4 (patch) | |
| tree | 577f31caa05926e2a6ba6daf16397a9a2768f09d /tests/ref/lavf/ts | |
| parent | 9b72041f805ed71a88182449984e3975fc76ceca (diff) | |
| parent | 246154a9aff222b80befd65faf97494ce9113306 (diff) | |
| download | ffmpeg-3b0ad040b3bffaea5c5fd36bfddd9a436bc6c9c4.tar.gz | |
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>
Diffstat (limited to 'tests/ref/lavf/ts')
0 files changed, 0 insertions, 0 deletions