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)
* 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>
1  2 
configure
doc/developer.texi
tests/fate/prores.mak
tests/ref/fate/prores-alpha

diff --cc configure
+++ b/configure
@@@ -2515,9 -2211,13 +2515,13 @@@ case "$toolchain" i
          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"
 -        target_exec_args="--track-origins=yes --leak-check=full"
 +        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"
      ;;
      msvc)
          cc_default="c99wrap cl"
Simple merge
@@@ -7,8 -7,8 +7,8 @@@ FATE_PRORES = fate-prores-42
  FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, PRORES) += $(FATE_PRORES)
  fate-prores: $(FATE_PRORES)
  
 -fate-prores-422:       CMD = framecrc -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422.mov -pix_fmt yuv422p10le
 -fate-prores-422_hq:    CMD = framecrc -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_HQ.mov -pix_fmt yuv422p10le
 -fate-prores-422_lt:    CMD = framecrc -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_LT.mov -pix_fmt yuv422p10le
 -fate-prores-422_proxy: CMD = framecrc -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_Proxy.mov -pix_fmt yuv422p10le
 -fate-prores-alpha:     CMD = framecrc -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_with_Alpha.mov -pix_fmt yuva444p10le
 +fate-prores-422:       CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422.mov -pix_fmt yuv422p10le
 +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
@@@ -1,3 -1,3 +1,3 @@@
 -#tb 0: 1/2997
 -0,          0,          0,        0, 16588800, 0x8dcdb600
 -0,        100,        100,        0, 16588800, 0x8dcdb600
 +#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