[FFmpeg-cvslog] Merge commit '46ce9ded96ffcb798b03da894cdb5fdac376a6ee'
Michael Niedermayer
git at videolan.org
Mon Jun 3 11:50:32 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 3 11:44:11 2013 +0200| [7cb5467a52011d194289035b51e27c4df80bf2a2] | committer: Michael Niedermayer
Merge commit '46ce9ded96ffcb798b03da894cdb5fdac376a6ee'
* commit '46ce9ded96ffcb798b03da894cdb5fdac376a6ee':
tiff: K&R formatting cosmetics
Conflicts:
libavcodec/tiff.c
libavcodec/tiff.h
libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7cb5467a52011d194289035b51e27c4df80bf2a2
---
More information about the ffmpeg-cvslog
mailing list