[FFmpeg-cvslog] Merge commit '89de5157b1cbe7807d3ec1d51bd56a75e98c002e'
Michael Niedermayer
git at videolan.org
Fri Nov 29 00:24:37 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 28 23:15:35 2013 +0100| [cb751a6a96475f525d9933a55ad2b88c1ec92fa1] | committer: Michael Niedermayer
Merge commit '89de5157b1cbe7807d3ec1d51bd56a75e98c002e'
* commit '89de5157b1cbe7807d3ec1d51bd56a75e98c002e':
dcadec: implement request_channel_layout.
Conflicts:
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb751a6a96475f525d9933a55ad2b88c1ec92fa1
---
More information about the ffmpeg-cvslog
mailing list