Merge commit 'eec7f032a903e06d249d1e8aa6630b65292bf40f'
* commit 'eec7f032a903e06d249d1e8aa6630b65292bf40f': lavf: Remove a redundant include of sys/stat.h Conflicts: libavformat/os_support.h See: 49515cb8407ba237329280d99ab7e79a02560dfe Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
6d8dda1693