diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 00:54:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 00:54:39 +0200 |
| commit | 8250943febe951824252d0f5b1e77b076544cbd3 (patch) | |
| tree | 3606bab01c9a751e43134144013e13d8aa1996e9 /libavcodec/wma.h | |
| parent | c8ec2109f9b3343204f28859ad101249d716b8a8 (diff) | |
| parent | ed5d62e509bf557764848c05931417b0cd60d4b3 (diff) | |
| download | ffmpeg-8250943febe951824252d0f5b1e77b076544cbd3.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavfi/af_pan: Support a maximum of 64 channels.
lswr: Allow 64 channels internally.
lavc: Allow 64 channels internally.
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/wma.h')
0 files changed, 0 insertions, 0 deletions