[FFmpeg-cvslog] Merge remote-tracking branch 'cehoyos/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri Jul 17 00:54:35 2015 +0200| [8250943febe951824252d0f5b1e77b076544cbd3] | committer: Michael Niedermayer

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 at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8250943febe951824252d0f5b1e77b076544cbd3
---