Commit 1edc87a6 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'b56b12cd'

* commit 'b56b12cd':
  configure: Check for x265_api_get

Conflicts:
	configure

See: f4be604fMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 1e51e517 b56b12cd
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment