Merge commit '4c8bd8ddb049950347a5018fecbca7ee25d48c44'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Aug 2014 18:40:34 +0000 (20:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Aug 2014 18:40:40 +0000 (20:40 +0200)
commit7206221d563e6d1d6bf2d5acd3b1378d77c7b7e4
treeac5cc4647e7618fff8f4f0c1bdbc22cda2b674e6
parente15824e75b5549e53eb5c1ffb79766321ac8d122
parent4c8bd8ddb049950347a5018fecbca7ee25d48c44
Merge commit '4c8bd8ddb049950347a5018fecbca7ee25d48c44'

* commit '4c8bd8ddb049950347a5018fecbca7ee25d48c44':
  os_support: Adjust an outdated #endif comment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/os_support.h