[FFmpeg-cvslog] Merge commit '2bcd8f22f2fae253d87b11a5c9f8805d79253180' into release/2.2

Michael Niedermayer git at videolan.org
Tue Dec 2 14:38:37 CET 2014


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Tue Dec  2 14:14:34 2014 +0100| [afcd152b973e40763aa800dd1376925ce6b146b9] | committer: Michael Niedermayer

Merge commit '2bcd8f22f2fae253d87b11a5c9f8805d79253180' into release/2.2

* commit '2bcd8f22f2fae253d87b11a5c9f8805d79253180':
  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=afcd152b973e40763aa800dd1376925ce6b146b9
---





More information about the ffmpeg-cvslog mailing list