projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 300d489 1019b7c)
Merge commit '1019b7c4edff537499c4a6cb0d65abae04ce58f6'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Aug 2014 19:49:00 +0000 (21:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Aug 2014 19:49:14 +0000 (21:49 +0200)
* 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>

Trivial merge
FFmpeg git repo