diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-28 23:15:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 00:18:42 +0100 |
| commit | cb751a6a96475f525d9933a55ad2b88c1ec92fa1 (patch) | |
| tree | 3a46c24e30281730c41c5f7de0471f86ece2d325 /libavcodec/psymodel.c | |
| parent | d1daa71f9d22756fa5bd6690e9f5fc31c94b1490 (diff) | |
| parent | 89de5157b1cbe7807d3ec1d51bd56a75e98c002e (diff) | |
| download | ffmpeg-cb751a6a96475f525d9933a55ad2b88c1ec92fa1.tar.gz | |
Merge commit '89de5157b1cbe7807d3ec1d51bd56a75e98c002e'
* commit '89de5157b1cbe7807d3ec1d51bd56a75e98c002e':
dcadec: implement request_channel_layout.
Conflicts:
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/psymodel.c')
0 files changed, 0 insertions, 0 deletions