Merge commit 'aafed1175df76603e94c99a7748968780d6548d2'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Apr 2013 13:04:16 +0000 (15:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Apr 2013 13:04:22 +0000 (15:04 +0200)
* commit 'aafed1175df76603e94c99a7748968780d6548d2':
  af_channelmap: sanity check input channel indices in all cases.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/af_channelmap.c

Simple merge