Merge commit 'b56b12cd12f32bf11efff05632600a7619584b98'

Browse Source

* commit 'b56b12cd12f32bf11efff05632600a7619584b98':
  configure: Check for x265_api_get

Conflicts:
	configure

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

...

This commit is contained in:

Michael Niedermayer 2015-06-27 18:13:26 +02:00

parent 1e51e517be b56b12cd12

commit 1edc87a665

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available