Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michael@niedermayer.cc>
Thu, 16 Jul 2015 22:54:35 +0000 (00:54 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 16 Jul 2015 22:54:39 +0000 (00:54 +0200)
* 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>

Trivial merge