Merge commit 'd00a504b244e136a0c82a55e21ed94659e0674ad'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Feb 2014 19:40:52 +0000 (20:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Feb 2014 19:53:10 +0000 (20:53 +0100)
commita88cbdfb90e4046aae427b5e196d3822b192b046
treefca78add9cd36e94dcae0ed011f2b60e081da92d
parenta908de7f49449beb66a9d70a0a06f8b59e564d69
parentd00a504b244e136a0c82a55e21ed94659e0674ad
Merge commit 'd00a504b244e136a0c82a55e21ed94659e0674ad'

* commit 'd00a504b244e136a0c82a55e21ed94659e0674ad':
  libx265: Update API usage

Conflicts:
libavcodec/libx265.c

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