[FFmpeg-cvslog] Merge commit '117d8c6d1f1c187ffc6098d9618457e00534e013'

Michael Niedermayer git at videolan.org
Thu Sep 20 19:59:07 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 20 19:31:24 2012 +0200| [b8044972c4f23e2d2fdf2c5a8ba67019a5045149] | committer: Michael Niedermayer

Merge commit '117d8c6d1f1c187ffc6098d9618457e00534e013'

* commit '117d8c6d1f1c187ffc6098d9618457e00534e013':
  matroska: implement support for ProRes
  matroska: implement support for ALAC

Conflicts:
	libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list