Merge commit '180e6b48060f97fdd8497320395b61dc85664ecd'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Jun 2014 19:20:10 +0000 (21:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Jun 2014 19:20:40 +0000 (21:20 +0200)
commitff0631ab058bd7a8cb7f5cc4585ac27e12c6fb6d
tree46adfa676b96c7676e156f37394fe405cf9cf7b1
parentc600c8e966996555724d574e26f9e95259b1f884
parent180e6b48060f97fdd8497320395b61dc85664ecd
Merge commit '180e6b48060f97fdd8497320395b61dc85664ecd'

* commit '180e6b48060f97fdd8497320395b61dc85664ecd':
  libx265: Actually use X265_API_IMPORTS

See: 4e9b46b0568196e9e1640350a3c6f5f09bfd9e47
Merged-by: Michael Niedermayer <michaelni@gmx.at>