[FFmpeg-cvslog] Merge commit '8b0dd4942aac320d1ca3c40fa7ea1be342c71273'
Michael Niedermayer
git at videolan.org
Fri Jul 18 22:24:09 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 18 22:16:04 2014 +0200| [521f5697348d96ac7c725bc2cba14d6ce4944334] | committer: Michael Niedermayer
Merge commit '8b0dd4942aac320d1ca3c40fa7ea1be342c71273'
* commit '8b0dd4942aac320d1ca3c40fa7ea1be342c71273':
idctdsp: prettyprinting cosmetics
Conflicts:
libavcodec/idctdsp.c
libavcodec/ppc/idctdsp.c
libavcodec/x86/idctdsp_init.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=521f5697348d96ac7c725bc2cba14d6ce4944334
---
More information about the ffmpeg-cvslog
mailing list