Merge commit '8aca00cc2b25810bdd85b75f5632844a5614b707'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Feb 2014 20:05:09 +0000 (21:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Feb 2014 20:06:45 +0000 (21:06 +0100)
* commit '8aca00cc2b25810bdd85b75f5632844a5614b707':
  libx265: Properly handled dynamic linking with MSVC

See: 87769d6c8f6d71e4814821f7e6f57b4b65eaf2a7
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge