[FFmpeg-cvslog] Merge commit '942269fd00cb48328e4cffb6e21a0b691ce9f6bc'
Michael Niedermayer
git at videolan.org
Tue Jul 29 01:51:08 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 29 01:32:48 2014 +0200| [983109bbd99939c0c3a35c96b1c36e823bf30f6b] | committer: Michael Niedermayer
Merge commit '942269fd00cb48328e4cffb6e21a0b691ce9f6bc'
* commit '942269fd00cb48328e4cffb6e21a0b691ce9f6bc':
caf: Use correct printf conversion specifiers for POSIX int types
Conflicts:
libavformat/cafdec.c
See: 1f36ebf63a8d6ffccf4bf286849d77f76aad8b8f
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=983109bbd99939c0c3a35c96b1c36e823bf30f6b
---
More information about the ffmpeg-cvslog
mailing list