[FFmpeg-cvslog] Merge commit '1019b7c4edff537499c4a6cb0d65abae04ce58f6'
Michael Niedermayer
git at videolan.org
Fri Aug 22 21:55:28 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 22 21:49:00 2014 +0200| [8f3caf52fc0d75a38137d0cb97d23c8802abd1ce] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8f3caf52fc0d75a38137d0cb97d23c8802abd1ce
---
More information about the ffmpeg-cvslog
mailing list