Merge commit 'eec7f032a903e06d249d1e8aa6630b65292bf40f'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Nov 2014 00:18:51 +0000 (01:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Nov 2014 00:18:51 +0000 (01:18 +0100)
commit6d8dda169384e3935d38da2ed127ba82fd666ee7
treebc2b8f64da5b7b4bc364b5a5b74418aca3f97c3e
parentd899ea2017ef555f93939db3bac259f4c1df0672
parenteec7f032a903e06d249d1e8aa6630b65292bf40f
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>