Skip to content
Snippets Groups Projects
Commit 1edc87a6 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit 'b56b12cd' 


* commit 'b56b12cd':
  configure: Check for x265_api_get

Conflicts:
	configure

See: f4be604f
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 1e51e517 b56b12cd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
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