Merge commit '1019b7c4edff537499c4a6cb0d65abae04ce58f6'

Browse Source

* 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>

...

This commit is contained in:

Michael Niedermayer 2014-08-22 21:49:00 +02:00

parent 300d489ac9 1019b7c4ed

commit 8f3caf52fc

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available