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/ref/fate/prores-alpha | |
| parent | 3e3514bce269f54b44773c72df3a12cbf4d8aa5b (diff) | |
| parent | 8e673efc6f5b7a095557664660305148f2788d30 (diff) | |
| download | ffmpeg-streaming-fa6001e7281d2bcc09c5f2eb66263ddc56f10799.zip ffmpeg-streaming-fa6001e7281d2bcc09c5f2eb66263ddc56f10799.tar.gz | |
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/ref/fate/prores-alpha')
| -rw-r--r-- | tests/ref/fate/prores-alpha | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/ref/fate/prores-alpha b/tests/ref/fate/prores-alpha index bdb5c6e..9a8b9ee 100644 --- a/tests/ref/fate/prores-alpha +++ b/tests/ref/fate/prores-alpha @@ -1,3 +1,3 @@ #tb 0: 100/2997 -0, 0, 0, 1, 12441600, 0x254d8f95 -0, 1, 1, 1, 12441600, 0x254d8f95 +0, 0, 0, 1, 16588800, 0x8dcdb600 +0, 1, 1, 1, 16588800, 0x8dcdb600 |
