diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-20 19:31:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-20 19:43:38 +0200 |
| commit | b8044972c4f23e2d2fdf2c5a8ba67019a5045149 (patch) | |
| tree | efef28d683123a9609eb2aba36be6ad4c197da0b /libavformat/ffm.h | |
| parent | 0da50055ebafb7852e80825abd0b8e5e72bd8b60 (diff) | |
| parent | 117d8c6d1f1c187ffc6098d9618457e00534e013 (diff) | |
| download | ffmpeg-b8044972c4f23e2d2fdf2c5a8ba67019a5045149.tar.gz | |
Merge commit '117d8c6d1f1c187ffc6098d9618457e00534e013'
* commit '117d8c6d1f1c187ffc6098d9618457e00534e013':
matroska: implement support for ProRes
matroska: implement support for ALAC
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ffm.h')
0 files changed, 0 insertions, 0 deletions