Merge commit 'b56b12cd12f32bf11efff05632600a7619584b98'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Jun 2015 16:13:26 +0000 (18:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Jun 2015 16:13:43 +0000 (18:13 +0200)
* commit 'b56b12cd12f32bf11efff05632600a7619584b98':
  configure: Check for x265_api_get

Conflicts:
configure

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

Trivial merge