[FFmpeg-cvslog] Merge commit 'b56b12cd12f32bf11efff05632600a7619584b98'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jun 27 18:13:26 2015 +0200| [1edc87a665bf4bbc49195b44a9206b02ac0781c9] | committer: Michael Niedermayer

Merge commit 'b56b12cd12f32bf11efff05632600a7619584b98'

* commit 'b56b12cd12f32bf11efff05632600a7619584b98':
  configure: Check for x265_api_get

Conflicts:
	configure

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1edc87a665bf4bbc49195b44a9206b02ac0781c9
---