[FFmpeg-cvslog] Merge commit '8e673efc6f5b7a095557664660305148f2788d30'

Michael Niedermayer git at videolan.org
Sun May 19 11:06:03 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 19 10:53:39 2013 +0200| [fa6001e7281d2bcc09c5f2eb66263ddc56f10799] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa6001e7281d2bcc09c5f2eb66263ddc56f10799
---





More information about the ffmpeg-cvslog mailing list