diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-19 10:53:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-19 10:53:39 +0200 |
| commit | fa6001e7281d2bcc09c5f2eb66263ddc56f10799 (patch) | |
| tree | 056be667bbcd67f4d813b775370d9aa046acd075 /tests/fate/prores.mak | |
| parent | 3e3514bce269f54b44773c72df3a12cbf4d8aa5b (diff) | |
| parent | 8e673efc6f5b7a095557664660305148f2788d30 (diff) | |
Merge commit '8e673efc6f5b7a095557664660305148f2788d30'
* commit '8e673efc6f5b7a095557664660305148f2788d30':
prores: update FATE test to account for alpha plane present in the test sample
configure: Add basic valgrind-massif support
Conflicts:
tests/fate/prores.mak
tests/ref/fate/prores-alpha
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/prores.mak')
| -rw-r--r-- | tests/fate/prores.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/prores.mak b/tests/fate/prores.mak index 00e2159710..56568b2d42 100644 --- a/tests/fate/prores.mak +++ b/tests/fate/prores.mak @@ -11,4 +11,4 @@ fate-prores-422: CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequ fate-prores-422_hq: CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_HQ.mov -pix_fmt yuv422p10le fate-prores-422_lt: CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_LT.mov -pix_fmt yuv422p10le fate-prores-422_proxy: CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_Proxy.mov -pix_fmt yuv422p10le -fate-prores-alpha: CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_with_Alpha.mov -pix_fmt yuv444p10le +fate-prores-alpha: CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_with_Alpha.mov -pix_fmt yuva444p10le |