[FFmpeg-cvslog] Merge commit 'df507d5aa063c2ce31fac9f76c6f3bbe9a20c445'
Michael Niedermayer
git at videolan.org
Sun Aug 3 18:47:58 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug 3 18:35:47 2014 +0200| [149c1a26c4c167a763461e191a248d704cb8538a] | committer: Michael Niedermayer
Merge commit 'df507d5aa063c2ce31fac9f76c6f3bbe9a20c445'
* commit 'df507d5aa063c2ce31fac9f76c6f3bbe9a20c445':
tiff: Replace deprecated PIX_FMT names by modern ones
Conflicts:
libavcodec/tiff.c
See: ac627b3d38d370027406c93c2dcaac0b1712a7d4
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=149c1a26c4c167a763461e191a248d704cb8538a
---
More information about the ffmpeg-cvslog
mailing list