Commit 6d8dda16 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'eec7f032'

* commit 'eec7f032':
  lavf: Remove a redundant include of sys/stat.h

Conflicts:
	libavformat/os_support.h

See: 49515cb8Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents d899ea20 eec7f032
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