Merge commit '192f1984b1a93aa08af053b8f9ab4950f307bd5d'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Mar 2013 11:23:04 +0000 (12:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Mar 2013 11:23:12 +0000 (12:23 +0100)
* commit '192f1984b1a93aa08af053b8f9ab4950f307bd5d':
  lavc: limit maximum number of channels to 63

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/internal.h

Simple merge