ffmpeg | branch: master | Michael Niedermayer <michae...@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 <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7d43fbe3aef8594fbc4a07c3990f865bb3e04628
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
