diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-22 21:49:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-22 21:49:14 +0200 |
| commit | 8f3caf52fc0d75a38137d0cb97d23c8802abd1ce (patch) | |
| tree | ad9174165f29e2f86dba416bc58b2417d2aaf810 /libswscale/x86 | |
| parent | 300d489ac9bb11b67bde90521d43d12fe68be72e (diff) | |
| parent | 1019b7c4edff537499c4a6cb0d65abae04ce58f6 (diff) | |
| download | ffmpeg-8f3caf52fc0d75a38137d0cb97d23c8802abd1ce.tar.gz | |
Merge commit '1019b7c4edff537499c4a6cb0d65abae04ce58f6'
* commit '1019b7c4edff537499c4a6cb0d65abae04ce58f6':
os_support: Undefine lseek/stat/fstat before defining them
Conflicts:
libavformat/os_support.h
See: ef122ff5072463366c020157f0a27aad7e6610db
See: ed3c0fe85dd5c228e98126b18e50ffb617e77070
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/x86')
0 files changed, 0 insertions, 0 deletions