[FFmpeg-cvslog] Merge commit '0f257e29c5520b215e573e7e3abde8e5a4743309'

Michael Niedermayer git at videolan.org
Sun Nov 30 18:26:06 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov 30 18:17:51 2014 +0100| [79440651149c89fba9ef5563c9b8a4b3a59acdf5] | committer: Michael Niedermayer

Merge commit '0f257e29c5520b215e573e7e3abde8e5a4743309'

* commit '0f257e29c5520b215e573e7e3abde8e5a4743309':
  Treat all '*.pnm' files as non-text file

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

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





More information about the ffmpeg-cvslog mailing list