[FFmpeg-cvslog] Merge commit 'ce99ef48ea025e90351079964d63be815374f089' into release/2.4

Michael Niedermayer git at videolan.org
Tue Dec 2 11:53:09 CET 2014


ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Tue Dec  2 11:40:39 2014 +0100| [575dc3a1b2ee6b14972edb9cee5af7b08dfc1f94] | committer: Michael Niedermayer

Merge commit 'ce99ef48ea025e90351079964d63be815374f089' into release/2.4

* commit 'ce99ef48ea025e90351079964d63be815374f089':
  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=575dc3a1b2ee6b14972edb9cee5af7b08dfc1f94
---





More information about the ffmpeg-cvslog mailing list