falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Merge commit '1019b7c4edff537499c4a6cb0d65abae04ce58f6' 

* commit '1019b7c4edff537499c4a6cb0d65abae04ce58f6':
  os_support: Undefine lseek/stat/fstat before defining them

Conflicts:
	libavformat/os_support.h

See: ef122ff507
See: ed3c0fe85d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.4
Michael Niedermayer 11 years ago
parent
300d489ac9 1019b7c4ed
commit
8f3caf52fc
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available