diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 17:20:50 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 17:21:52 +0100 |
commit | 3552bd93185a1f9be8733a17104f462cd7d7a9a7 (patch) | |
tree | 9282c0edf8e3dd4b4dd014f157044c34dc6527cb /doc | |
parent | 5eb1704d5f5a85ff5b532887d559f3cf2822d8fc (diff) | |
parent | e1c058dba930c1f6f180e04d9e26dbda261cedbc (diff) | |
download | ffmpeg-3552bd93185a1f9be8733a17104f462cd7d7a9a7.tar.gz |
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: fb3cea4be339f4544ca37fb0bc917d734d063a1f and later commits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions