Commit 3552bd93 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'e1c058db'

* commit 'e1c058db':
  FATE: Add HEVC tests

Conflicts:
	tests/fate/hevc.mak
	tests/ref/fate/hevc-conformance-DBLK_A_SONY_3
	tests/ref/fate/hevc-conformance-DBLK_B_SONY_3
	tests/ref/fate/hevc-conformance-DBLK_C_SONY_3
	tests/ref/fate/hevc-conformance-DELTAQP_B_SONY_3
	tests/ref/fate/hevc-conformance-DELTAQP_C_SONY_3
	tests/ref/fate/hevc-conformance-POC_A_Bossen_3
	tests/ref/fate/hevc-conformance-RPS_D_ericsson_5
	tests/ref/fate/hevc-conformance-WP_B_Toshiba_3
	tests/ref/fate/hevc-conformance-WP_MAIN10_B_Toshiba_3

See: fb3cea4b and later commits
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 5eb1704d e1c058db
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