diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 13:19:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 13:19:26 +0200 |
| commit | 61917a104e0ce8d7b3b74ad66624a4f295b41c71 (patch) | |
| tree | ab83309115176af4990636e4e468bd87714bb69f /library.mak | |
| parent | dff4aa6afd40bcc6c71b5a21d229fb941f9fc1eb (diff) | |
| parent | 106b62f4ba600f24415eaded5e020aeceb23fd59 (diff) | |
| download | ffmpeg-61917a104e0ce8d7b3b74ad66624a4f295b41c71.tar.gz | |
Merge commit '106b62f4ba600f24415eaded5e020aeceb23fd59'
* commit '106b62f4ba600f24415eaded5e020aeceb23fd59':
matroskaenc: write the channel mask for FLAC
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'library.mak')
0 files changed, 0 insertions, 0 deletions