diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-25 09:54:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-25 09:54:11 +0200 |
| commit | 575399c7e11611b4cbf30a61e0e8e92f12893896 (patch) | |
| tree | 9eda22086dc72804fc573a85b3ead4f19033be88 /tests/fate | |
| parent | aa96439fae67d8cefa2376d60f9a0e29b234ceaa (diff) | |
| parent | fc18cc44ebfae07da153dc782572e7ce2f6fe47d (diff) | |
| download | ffmpeg-575399c7e11611b4cbf30a61e0e8e92f12893896.tar.gz | |
Merge commit 'fc18cc44ebfae07da153dc782572e7ce2f6fe47d'
* commit 'fc18cc44ebfae07da153dc782572e7ce2f6fe47d':
fate: add CVFC1_Sony_C to h264 conformance tests
doc/APIchanges: add missing hashes and dates
Conflicts:
doc/APIchanges
tests/fate/h264.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
| -rw-r--r-- | tests/fate/h264.mak | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak index 2cbd5df0d2..0b336fcbe6 100644 --- a/tests/fate/h264.mak +++ b/tests/fate/h264.mak @@ -64,6 +64,7 @@ FATE_H264 = aud_mw_e \ ci_mw_d \ cvbs3_sony_c \ cvcanlma2_sony_c \ + cvfc1_sony_c \ cvfi1_sony_d \ cvfi1_sva_c \ cvfi2_sony_h \ @@ -266,6 +267,7 @@ fate-h264-conformance-ci1_ft_b: CMD = framecrc -vsync drop -i fate-h264-conformance-ci_mw_d: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CI_MW_D.264 fate-h264-conformance-cvbs3_sony_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVBS3_Sony_C.jsv fate-h264-conformance-cvcanlma2_sony_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVCANLMA2_Sony_C.jsv +fate-h264-conformance-cvfc1_sony_c: CMD = framecrc -flags unaligned -i $(SAMPLES)/h264-conformance/CVFC1_Sony_C.jsv fate-h264-conformance-cvfi1_sony_d: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVFI1_Sony_D.jsv fate-h264-conformance-cvfi1_sva_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVFI1_SVA_C.264 fate-h264-conformance-cvfi2_sony_h: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVFI2_Sony_H.jsv |