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

@@ -2515,6 +2515,10 @@ case "$toolchain" in
         add_cflags  -fsanitize=thread -pie
         add_ldflags -fsanitize=thread -pie
     ;;
+    valgrind-massif)
+        target_exec_default="valgrind"
+        target_exec_args="--alloc-fn=av_malloc --alloc-fn=av_mallocz"
+    ;;
     valgrind-memcheck)
         target_exec_default=${valgrind:-"valgrind"}
         target_exec_args="--error-exitcode=1 --malloc-fill=0x2a --track-origins=yes --leak-check=full --gen-suppressions=all --suppressions=$source_path/tests/fate-valgrind.supp"

doc/developer.texi

@@ -608,9 +608,10 @@ new test.
 
 The configure script provides a shortcut for using valgrind to spot bugs
 related to memory handling. Just add the option
-@code{--toolchain=valgrind-memcheck} to your configure line, and
-reasonable defaults will be set for running FATE under the supervision
-of the @strong{memcheck} tool of the valgrind suite.
+@code{--toolchain=valgrind-memcheck} or @code{--toolchain=valgrind-massif}
+to your configure line, and reasonable defaults will be set for running
+FATE under the supervision of either the @strong{memcheck} or the
+@strong{massif} tool of the valgrind suite.
 
 In case you need finer control over how valgrind is invoked, use the
 @code{--target-exec='valgrind <your_custom_valgrind_options>} option in

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

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