[FFmpeg-cvslog] Merge commit 'c598b569fb3d1f4b6c4868fe64f6989254df5186'
Michael Niedermayer
git at videolan.org
Mon Mar 17 15:30:32 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 17 15:24:05 2014 +0100| [a00d4c5956e178296c31a631679618be4910ba5a] | committer: Michael Niedermayer
Merge commit 'c598b569fb3d1f4b6c4868fe64f6989254df5186'
* commit 'c598b569fb3d1f4b6c4868fe64f6989254df5186':
png: K&R formatting cosmetics
Conflicts:
libavcodec/png.c
libavcodec/pngdec.c
libavcodec/pngenc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a00d4c5956e178296c31a631679618be4910ba5a
---
More information about the ffmpeg-cvslog
mailing list