Merge commit '60728e8bab8d2a5f6bbb4baa7d53142dbc6047ed'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 20:05:41 +0000 (21:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 20:08:45 +0000 (21:08 +0100)
commitfc2de9b7cf59eda377fffcd8d6c3ab4b1fa57b22
tree9bb438dc1e4d65df4f20bd0fce15ed3f3126c956
parentab8d9fe9b84c92b21354a7e5df3b61a28477f576
parent60728e8bab8d2a5f6bbb4baa7d53142dbc6047ed
Merge commit '60728e8bab8d2a5f6bbb4baa7d53142dbc6047ed'

* commit '60728e8bab8d2a5f6bbb4baa7d53142dbc6047ed':
  libx265: Write global extradata when requested

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