mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
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:
commit
3552bd9318