diff options
| author | Michael Niedermayer <[email protected]> | 2014-05-28 12:28:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-05-28 12:28:23 +0200 |
| commit | 61301ca7860fb044995c71a0cd432cb3d833eb3b (patch) | |
| tree | ebe79c242179339032ea8528a3a5bb0b65457fff /libavformat/ircam.c | |
| parent | 03ffaed3f0199f82ae32c28923f41f22123aea95 (diff) | |
| parent | 54ed488b1af583df6c9d2a73b4a44f16b7e4f82c (diff) | |
Merge commit '54ed488b1af583df6c9d2a73b4a44f16b7e4f82c'
* commit '54ed488b1af583df6c9d2a73b4a44f16b7e4f82c':
flac muxer: write WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag for multichannel files
Conflicts:
libavformat/flacenc.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/ircam.c')
0 files changed, 0 insertions, 0 deletions