RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'e1c058dba930c1f6f180e04d9e26dbda261cedbc' 

* commit 'e1c058dba930c1f6f180e04d9e26dbda261cedbc':
  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: fb3cea4be3 and later commits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-01 17:20:50 +01:00
parent 5eb1704d5f e1c058dba9
commit 3552bd9318
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available