Skip to content

F
ffmpeg.wasm-core
Commit 8f3caf52 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge commit '1019b7c4' 

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

Conflicts:
	libavformat/os_support.h

See: ef122ff5
See: ed3c0fe8Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 300d489a 1019b7c4
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 0 deletions
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment