mirror of
https://github.com/nyanmisaka/ffmpeg-rockchip.git
synced 2026-01-24 02:20:56 +01:00
Merge commit 'e1c058dba9'
* commit 'e1c058dba9': 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:fb3cea4be3and later commits Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
3552bd9318