Merge commit '8e673efc6f5b7a095557664660305148f2788d30'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 19 May 2013 08:53:39 +0000 (10:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 19 May 2013 08:53:39 +0000 (10:53 +0200)
commitfa6001e7281d2bcc09c5f2eb66263ddc56f10799
tree056be667bbcd67f4d813b775370d9aa046acd075
parent3e3514bce269f54b44773c72df3a12cbf4d8aa5b
parent8e673efc6f5b7a095557664660305148f2788d30
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>
configure
doc/developer.texi
tests/fate/prores.mak
tests/ref/fate/prores-alpha