[FFmpeg-cvslog] Merge commit '45ff7c93dd84a254cc96acc589e5ac3d7bd16bce'
Michael Niedermayer
git at videolan.org
Tue Sep 16 20:38:15 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 16 20:31:02 2014 +0200| [7d43fbe3aef8594fbc4a07c3990f865bb3e04628] | committer: Michael Niedermayer
Merge commit '45ff7c93dd84a254cc96acc589e5ac3d7bd16bce'
* commit '45ff7c93dd84a254cc96acc589e5ac3d7bd16bce':
dca: K&R formatting cosmetics
Conflicts:
libavcodec/dca_parser.c
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7d43fbe3aef8594fbc4a07c3990f865bb3e04628
---
More information about the ffmpeg-cvslog
mailing list