Merge commit '3b5e5e6a29d62462d0505287042fa4c2b99c4f2b'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 May 2015 20:25:50 +0000 (22:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 May 2015 20:32:13 +0000 (22:32 +0200)
commita3adba358bbb3e8f953b15ad2820a3ff996ef91b
tree86e0c5500a1f4a41c1304d71d47b766165bf0444
parent3bf81d389638199ebdbe8f2d302b4c2a7f6563d2
parent3b5e5e6a29d62462d0505287042fa4c2b99c4f2b
Merge commit '3b5e5e6a29d62462d0505287042fa4c2b99c4f2b'

* commit '3b5e5e6a29d62462d0505287042fa4c2b99c4f2b':
  libx265: Use the Multi-library Interface

See: 94c20de429420f541aba2d371c6175e8658f8353
Merged-by: Michael Niedermayer <michaelni@gmx.at>